From: dingtianhong <dingtianhong@huawei.com>
Date: Thu, 11 Jul 2013 11:04:06 +0000 (+0800)
Subject: ifb: fix oops when loading the ifb failed
X-Git-Tag: v3.0.88~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8956c3efefa2a61df16a47ba4f159e3d49717858;p=thirdparty%2Fkernel%2Fstable.git

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 280f4a8fca973..902ba2f61b007 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -252,6 +252,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);
@@ -259,6 +261,8 @@ static int __init ifb_init_module(void)
 	}
 	if (err)
 		__rtnl_link_unregister(&ifb_link_ops);
+
+out:
 	rtnl_unlock();
 
 	return err;