diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2020-03-21 14:08:29 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-06-11 19:05:35 +0100 |
| commit | 8262bc14b32853532c2fba0649524afa951c983b (patch) | |
| tree | cc66bc2b6acfa9ab7209148af43826c235abe5f9 | |
| parent | fc32a080b625b4e9f997468eafbacc537229c7ef (diff) | |
| download | linux-stable-8262bc14b32853532c2fba0649524afa951c983b.tar.gz | |
slcan: not call free_netdev before rtnl_unlock in slcan_open
commit 2091a3d42b4f339eaeed11228e0cbe9d4f92f558 upstream.
As the description before netdev_run_todo, we cannot call free_netdev
before rtnl_unlock, fix it by reorder the code.
This patch is a 1:1 copy of upstream slip.c commit f596c87005f7
("slip: not call free_netdev before rtnl_unlock in slip_open").
Reported-by: yangerkun <yangerkun@huawei.com>
Signed-off-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/can/slcan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c index 02ea23c2212666..772fe3bfc348ab 100644 --- a/drivers/net/can/slcan.c +++ b/drivers/net/can/slcan.c @@ -620,7 +620,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(); slc_free_netdev(sl->dev); + return err; err_exit: rtnl_unlock(); |