summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-04-21 23:53:27 +0000
committerDavid S. Miller <davem@davemloft.net>2010-04-22 15:57:26 -0700
commit80032cffb95edff4fc216b1cb21682257be326b7 (patch)
treee058d007a9db28dcb61a5903b6d79e5e6b96f0c3
parentf4f914b58019f0e50d521bbbadfaee260d766f95 (diff)
downloadop-kernel-dev-80032cffb95edff4fc216b1cb21682257be326b7.zip
op-kernel-dev-80032cffb95edff4fc216b1cb21682257be326b7.tar.gz
rtnetlink: potential ERR_PTR dereference
In the original code, if rtnl_create_link() returned an ERR_PTR then that would get passed to rtnl_configure_link() which dereferences it. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/rtnetlink.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 4568120..fe776c9 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1270,10 +1270,11 @@ replay:
err = ops->newlink(net, dev, tb, data);
else
err = register_netdevice(dev);
- if (err < 0 && !IS_ERR(dev)) {
+
+ if (err < 0 && !IS_ERR(dev))
free_netdev(dev);
+ if (err < 0)
goto out;
- }
err = rtnl_configure_link(dev, ifm);
if (err < 0)
OpenPOWER on IntegriCloud