summaryrefslogtreecommitdiffstats
path: root/drivers/net/slip
diff options
context:
space:
mode:
authorAndre Naujoks <nautsch2@gmail.com>2013-09-13 19:37:11 +0200
committerDavid S. Miller <davem@davemloft.net>2013-09-20 15:38:26 -0400
commitcc9fa74e2a195f7bab27fbbc4896d2fe3ec32150 (patch)
tree73ac9a9033f828b7130f4717005eb4404b8e67c5 /drivers/net/slip
parentdcb30e659287a6b40dafed1362532da42ec27229 (diff)
downloadlinux-stable-cc9fa74e2a195f7bab27fbbc4896d2fe3ec32150.tar.gz
linux-stable-cc9fa74e2a195f7bab27fbbc4896d2fe3ec32150.tar.bz2
linux-stable-cc9fa74e2a195f7bab27fbbc4896d2fe3ec32150.zip
slip/slcan: added locking in wakeup function
The locking is needed, since the the internal buffer for the CAN frames is changed during the wakeup call. This could cause buffer inconsistencies under high loads, especially for the outgoing short CAN packet skbuffs. The needed locks led to deadlocks before commit "5ede52538ee2b2202d9dff5b06c33bfde421e6e4 tty: Remove extra wakeup from pty write() path", which removed the direct callback to the wakeup function from the tty layer. As slcan.c is based on slip.c the issue in the original code is fixed, too. Signed-off-by: Andre Naujoks <nautsch2@gmail.com> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/slip')
-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 a34d6bf5e43b..cc70ecfc7062 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -429,11 +429,13 @@ static void slip_write_wakeup(struct tty_struct *tty)
if (!sl || sl->magic != SLIP_MAGIC || !netif_running(sl->dev))
return;
+ spin_lock(&sl->lock);
if (sl->xleft <= 0) {
/* Now serial buffer is almost free & we can start
* transmission of another packet */
sl->dev->stats.tx_packets++;
clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
+ spin_unlock(&sl->lock);
sl_unlock(sl);
return;
}
@@ -441,6 +443,7 @@ static void slip_write_wakeup(struct tty_struct *tty)
actual = tty->ops->write(tty, sl->xhead, sl->xleft);
sl->xleft -= actual;
sl->xhead += actual;
+ spin_unlock(&sl->lock);
}
static void sl_tx_timeout(struct net_device *dev)