diff options
Diffstat (limited to 'freed-ora/tags/f16/3.3.2-5.fc16.gnu/wimax-i2400m-prevent-a-possible-kernel-bug-due-to-mi.patch')
-rw-r--r-- | freed-ora/tags/f16/3.3.2-5.fc16.gnu/wimax-i2400m-prevent-a-possible-kernel-bug-due-to-mi.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/freed-ora/tags/f16/3.3.2-5.fc16.gnu/wimax-i2400m-prevent-a-possible-kernel-bug-due-to-mi.patch b/freed-ora/tags/f16/3.3.2-5.fc16.gnu/wimax-i2400m-prevent-a-possible-kernel-bug-due-to-mi.patch new file mode 100644 index 000000000..92b2e9970 --- /dev/null +++ b/freed-ora/tags/f16/3.3.2-5.fc16.gnu/wimax-i2400m-prevent-a-possible-kernel-bug-due-to-mi.patch @@ -0,0 +1,34 @@ +From 4eee6a3a04e8bb53fbe7de0f64d0524d3fbe3f80 Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil.sutter@viprinet.com> +Date: Mon, 26 Mar 2012 09:01:30 +0000 +Subject: [PATCH] wimax: i2400m - prevent a possible kernel bug due to missing + fw_name string + +This happened on a machine with a custom hotplug script calling nameif, +probably due to slow firmware loading. At the time nameif uses ethtool +to gather interface information, i2400m->fw_name is zero and so a null +pointer dereference occurs from within i2400m_get_drvinfo(). + +Signed-off-by: Phil Sutter <phil.sutter@viprinet.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/wimax/i2400m/netdev.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c +index 63e4b70..1d76ae8 100644 +--- a/drivers/net/wimax/i2400m/netdev.c ++++ b/drivers/net/wimax/i2400m/netdev.c +@@ -597,7 +597,8 @@ static void i2400m_get_drvinfo(struct net_device *net_dev, + struct i2400m *i2400m = net_dev_to_i2400m(net_dev); + + strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver) - 1); +- strncpy(info->fw_version, i2400m->fw_name, sizeof(info->fw_version) - 1); ++ strncpy(info->fw_version, ++ i2400m->fw_name ? : "", sizeof(info->fw_version) - 1); + if (net_dev->dev.parent) + strncpy(info->bus_info, dev_name(net_dev->dev.parent), + sizeof(info->bus_info) - 1); +-- +1.7.7.6 + |