diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-04-08 08:24:50 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-04-08 08:24:50 +0000 |
| commit | d515b9e7c77d3d657ceb0bf06d460ec06ac87f85 (patch) | |
| tree | ecee96512f64d3bf48c71b236a9e58055a6e1368 /target | |
| parent | ee9470c5087d7623d131de444f286742a6b7dd31 (diff) | |
| download | upstream-d515b9e7c77d3d657ceb0bf06d460ec06ac87f85.tar.gz upstream-d515b9e7c77d3d657ceb0bf06d460ec06ac87f85.tar.bz2 upstream-d515b9e7c77d3d657ceb0bf06d460ec06ac87f85.zip | |
ramips: avoid invalid pointer dereference in pinmux code
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36269 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ramips/patches-3.8/0125-MIPS-ralink-process-PCI-pinmux-group.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/target/linux/ramips/patches-3.8/0125-MIPS-ralink-process-PCI-pinmux-group.patch b/target/linux/ramips/patches-3.8/0125-MIPS-ralink-process-PCI-pinmux-group.patch index 08cd2428f7..d5c037e2e3 100644 --- a/target/linux/ramips/patches-3.8/0125-MIPS-ralink-process-PCI-pinmux-group.patch +++ b/target/linux/ramips/patches-3.8/0125-MIPS-ralink-process-PCI-pinmux-group.patch @@ -19,11 +19,14 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> u32 mode = 0; np = of_find_compatible_node(NULL, NULL, "ralink,rt3050-sysc"); -@@ -76,5 +76,17 @@ void ralink_pinmux(void) +@@ -76,5 +76,20 @@ void ralink_pinmux(void) if (wdt && *wdt && rt_pinmux.wdt_reset) rt_pinmux.wdt_reset(); -+ of_property_read_string(np, "ralink,pcimux", &pci); ++ pci = NULL; ++ if (rt_pinmux.pci) ++ of_property_read_string(np, "ralink,pcimux", &pci); ++ + if (pci) { + int m = ralink_mux_mask(pci, rt_pinmux.pci); + mode &= ~(rt_pinmux.pci_mask << rt_pinmux.pci_shift); |