diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-14 12:50:52 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-14 12:50:52 +0300 |
| commit | d15a5020cf18d13f6116c8dfcfbf242f6559a369 (patch) | |
| tree | 2379c38cf06a632aface7d0e8da65841091e02fd /drivers | |
| parent | bb9b5441e7c06b822b5f77ecca453bce3e6bc1bf (diff) | |
| parent | ed50e1600b4483c049ce76e6bd3b665a6a9300ed (diff) | |
| download | linux-d15a5020cf18d13f6116c8dfcfbf242f6559a369.tar.xz | |
Merge tag 'linux-can-fixes-for-5.4-20191114' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2019-11-14
here another pull request for net/master consisting of one patch (including my S-o-b).
Jouni Hogander's patch fixes a memory leak found by the syzbot in the slcan
driver's error path.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/can/slcan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c index bb6032211043..0a9f42e5fedf 100644 --- a/drivers/net/can/slcan.c +++ b/drivers/net/can/slcan.c @@ -617,6 +617,7 @@ err_free_chan: sl->tty = NULL; tty->disc_data = NULL; clear_bit(SLF_INUSE, &sl->flags); + free_netdev(sl->dev); err_exit: rtnl_unlock(); |