aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordingtianhong <dingtianhong@huawei.com>2013-07-11 19:04:06 +0800
committerWilly Tarreau <w@1wt.eu>2014-05-19 07:53:46 +0200
commit5393c4b20b6fe78df930a0fe1821ec72ba735541 (patch)
treeaff9cd9da811019ea26fe1bc047bc6f539dca689
parent8665a8c475b12393bb8eed9b3c7401da9513d3c1 (diff)
ifb: fix oops when loading the ifb failed
[ Upstream commit f2966cd5691058b8674a20766525bedeaea9cbcf ] If __rtnl_link_register() return faild when loading the ifb, it will take the wrong path and get oops, so fix it just like dummy. Signed-off-by: Ding Tianhong <dingtianhong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--drivers/net/ifb.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index cfd55107149f..509c6f52e891 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -269,6 +269,8 @@ static int __init ifb_init_module(void)
rtnl_lock();
err = __rtnl_link_register(&ifb_link_ops);
+ if (err < 0)
+ goto out;
for (i = 0; i < numifbs && !err; i++) {
err = ifb_init_one(i);
@@ -276,6 +278,8 @@ static int __init ifb_init_module(void)
}
if (err)
__rtnl_link_unregister(&ifb_link_ops);
+
+out:
rtnl_unlock();
return err;