diff options
| author | Cong Wang <xiyou.wangcong@gmail.com> | 2018-12-29 13:56:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-30 20:22:48 -0800 |
| commit | d5c7c745f254c6cb98b3b3f15fe789b8bd770c72 (patch) | |
| tree | 7fc6a09d7ea3da996a921d319f2d7ae22a321039 /drivers/net/wan | |
| parent | c433570458e49bccea5c551df628d058b3526289 (diff) | |
| download | linux-d5c7c745f254c6cb98b3b3f15fe789b8bd770c72.tar.bz2 | |
net/wan: fix a double free in x25_asy_open_tty()
When x25_asy_open() fails, it already cleans up by itself,
so its caller doesn't need to free the memory again.
It seems we still have to call x25_asy_free() to clear the SLF_INUSE
bit, so just set these pointers to NULL after kfree().
Reported-and-tested-by: syzbot+5e5e969e525129229052@syzkaller.appspotmail.com
Fixes: 3b780bed3138 ("x25_asy: Free x25_asy on x25_asy_open() failure.")
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/x25_asy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 1098263ab862..46c3d983b7b7 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c @@ -485,8 +485,10 @@ static int x25_asy_open(struct net_device *dev) /* Cleanup */ kfree(sl->xbuff); + sl->xbuff = NULL; noxbuff: kfree(sl->rbuff); + sl->rbuff = NULL; norbuff: return -ENOMEM; } |