diff options
author | Alan <gnomes@lxorguk.ukuu.org.uk> | 2016-01-06 14:55:02 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-01-06 15:06:27 -0500 |
commit | fde55c45d2175bd3e33aa28ee31e4ea6efa354e1 (patch) | |
tree | 6f6c4b0883f9eeda92c08641a9254c42f1f1c49b /drivers/net/hamradio/mkiss.c | |
parent | 07a5d38453599052aff0877b16bb9c1585f08609 (diff) | |
download | op-kernel-dev-fde55c45d2175bd3e33aa28ee31e4ea6efa354e1.zip op-kernel-dev-fde55c45d2175bd3e33aa28ee31e4ea6efa354e1.tar.gz |
mkiss: fix scribble on freed memory
commit d79f16c046086f4fe0d42184a458e187464eb83e fixed a user triggerable
scribble on free memory but added a new one which allows the user to
scribble even more and user controlled data into freed space.
As with 6pack we need to halt the queue before we free the buffers, because
the transmit logic is not protected by the semaphore.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hamradio/mkiss.c')
-rw-r--r-- | drivers/net/hamradio/mkiss.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index 0b72b9d..85828f1 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c @@ -797,6 +797,11 @@ static void mkiss_close(struct tty_struct *tty) */ if (!atomic_dec_and_test(&ax->refcnt)) down(&ax->dead_sem); + /* + * Halt the transmit queue so that a new transmit cannot scribble + * on our buffers + */ + netif_stop_queue(ax->dev); /* Free all AX25 frame buffers. */ kfree(ax->rbuff); |