aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangerkun <yangerkun@huawei.com>2020-02-26 11:54:35 +0800
committerBen Hutchings <ben@decadent.org.uk>2020-06-11 19:05:36 +0100
commit78c31fa288ee2f58f84c792cc75d93efd073f4cf (patch)
treefdf6770bae181519cdfdf632e01264e11ebb0a4c
parente143aa385d0d7bd954fe97d4719f8dce933e67f8 (diff)
downloadlinux-stable-78c31fa288ee2f58f84c792cc75d93efd073f4cf.tar.gz
slip: not call free_netdev before rtnl_unlock in slip_open
commit f596c87005f7b1baeb7d62d9a9e25d68c3dfae10 upstream. As the description before netdev_run_todo, we cannot call free_netdev before rtnl_unlock, fix it by reorder the code. Signed-off-by: yangerkun <yangerkun@huawei.com> Reviewed-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: David S. Miller <davem@davemloft.net> [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/net/slip/slip.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index a29e8c8c44b06..812fe19986e21 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -867,7 +867,10 @@ err_free_chan:
sl->tty = NULL;
tty->disc_data = NULL;
clear_bit(SLF_INUSE, &sl->flags);
+ /* do not call free_netdev before rtnl_unlock */
+ rtnl_unlock();
sl_free_netdev(sl->dev);
+ return err;
err_exit:
rtnl_unlock();