The patch titled
PPC: CHRP: fix possible NULL pointer dereference
has been removed from the -mm tree. Its filename was
ppc-chrp-fix-possible-null-pointer-dereference.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: PPC: CHRP: fix possible NULL pointer dereference
From: Cyrill Gorcunov <[EMAIL PROTECTED]>
Fix possible NULL pointer dereference inside of strncmp() if
of_get_property() failed.
[EMAIL PROTECTED]: coding-style fixes]
Signed-off-by: Cyrill Gorcunov <[EMAIL PROTECTED]>
Cc: Olof Johansson <[EMAIL PROTECTED]>
Cc: Paul Mackerras <[EMAIL PROTECTED]>
Cc: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
arch/powerpc/platforms/chrp/setup.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff -puN
arch/powerpc/platforms/chrp/setup.c~ppc-chrp-fix-possible-null-pointer-dereference
arch/powerpc/platforms/chrp/setup.c
---
a/arch/powerpc/platforms/chrp/setup.c~ppc-chrp-fix-possible-null-pointer-dereference
+++ a/arch/powerpc/platforms/chrp/setup.c
@@ -115,7 +115,7 @@ void chrp_show_cpuinfo(struct seq_file *
seq_printf(m, "machine\t\t: CHRP %s\n", model);
/* longtrail (goldengate) stuff */
- if (!strncmp(model, "IBM,LongTrail", 13)) {
+ if (model && !strncmp(model, "IBM,LongTrail", 13)) {
/* VLSI VAS96011/12 `Golden Gate 2' */
/* Memory banks */
sdramen = (in_le32(gg2_pci_config_base + GG2_PCI_DRAM_CTRL)
@@ -203,15 +203,20 @@ static void __init sio_fixup_irq(const c
static void __init sio_init(void)
{
struct device_node *root;
+ const char *model;
- if ((root = of_find_node_by_path("/")) &&
- !strncmp(of_get_property(root, "model", NULL),
- "IBM,LongTrail", 13)) {
+ root = of_find_node_by_path("/");
+ if (!root)
+ return;
+
+ model = of_get_property(root, "model", NULL);
+ if (model && !strncmp(model, "IBM,LongTrail", 13)) {
/* logical device 0 (KBC/Keyboard) */
sio_fixup_irq("keyboard", 0, 1, 2);
/* select logical device 1 (KBC/Mouse) */
sio_fixup_irq("mouse", 1, 12, 2);
}
+
of_node_put(root);
}
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
origin.patch
git-powerpc.patch
ppc-fix-missed-increment-on-device-interface-counter.patch
net-mac80211-fix-inappropriate-memory-freeing.patch
git-x86.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
