summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJarek Poplawski <jarkao2@gmail.com>2008-12-23 04:35:28 +0100
committerDavid S. Miller <davem@davemloft.net>2008-12-23 04:35:28 +0100
commit5f2f6da76c429c42d54f73807f00b8fd761a7d68 (patch)
tree20cabaf277e2e95df669c4e9ee6968067b096dc0 /net
parenttg3: Update version to 3.97 (diff)
downloadlinux-5f2f6da76c429c42d54f73807f00b8fd761a7d68.tar.xz
linux-5f2f6da76c429c42d54f73807f00b8fd761a7d68.zip
net: Fix oops in dev_ifsioc()
A command like this: "brctl addif br1 eth1" issued as a user gave me an oops when bridge module wasn't loaded. It's caused by using a dev pointer before checking for NULL. Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 048cf1197872..daca72e6b37b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3745,11 +3745,13 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)
{
int err;
struct net_device *dev = __dev_get_by_name(net, ifr->ifr_name);
- const struct net_device_ops *ops = dev->netdev_ops;
+ const struct net_device_ops *ops;
if (!dev)
return -ENODEV;
+ ops = dev->netdev_ops;
+
switch (cmd) {
case SIOCSIFFLAGS: /* Set interface flags */
return dev_change_flags(dev, ifr->ifr_flags);