aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorCong Wang <cwang@twopensource.com>2014-06-03 19:40:47 -0400
committerDavid S. Miller <davem@davemloft.net>2014-06-03 22:16:10 -0400
commite51fb152318ee6502a2d224771b0bbbbda046128 (patch)
tree313cc6f5be89fabea00162cf970285791c07899b /net
parent9aaae044abe95de182d09004cc3fa181bf22e6e0 (diff)
rtnetlink: fix a memory leak when ->newlink fails
It is possible that ->newlink() fails before registering the device, in this case we should just free it, it's safe to call free_netdev(). Fixes: commit 0e0eee2465df77bcec2 (net: correct error path in rtnl_newlink()) Cc: David S. Miller <davem@davemloft.net> Cc: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Cong Wang <cwang@twopensource.com> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/rtnetlink.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 2d8d8fcfa060..f4e9037f9a0c 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2019,11 +2019,15 @@ replay:
2019 if (ops->newlink) { 2019 if (ops->newlink) {
2020 err = ops->newlink(net, dev, tb, data); 2020 err = ops->newlink(net, dev, tb, data);
2021 /* Drivers should call free_netdev() in ->destructor 2021 /* Drivers should call free_netdev() in ->destructor
2022 * and unregister it on failure so that device could be 2022 * and unregister it on failure after registration
2023 * finally freed in rtnl_unlock. 2023 * so that device could be finally freed in rtnl_unlock.
2024 */ 2024 */
2025 if (err < 0) 2025 if (err < 0) {
2026 /* If device is not registered at all, free it now */
2027 if (dev->reg_state == NETREG_UNINITIALIZED)
2028 free_netdev(dev);
2026 goto out; 2029 goto out;
2030 }
2027 } else { 2031 } else {
2028 err = register_netdevice(dev); 2032 err = register_netdevice(dev);
2029 if (err < 0) { 2033 if (err < 0) {