From: Greg Kroah-Hartman Date: Fri, 27 Jan 2006 21:11:26 +0000 (-0800) Subject: another patch X-Git-Tag: v2.6.14.7~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a16f0d1a5460a714aaf3c81c92804435a761d07;p=thirdparty%2Fkernel%2Fstable-queue.git another patch --- diff --git a/queue/fix-mkiss-locking-bug.patch b/queue/fix-mkiss-locking-bug.patch new file mode 100644 index 00000000000..6e662a9bd2b --- /dev/null +++ b/queue/fix-mkiss-locking-bug.patch @@ -0,0 +1,29 @@ +From stable-bounces@linux.kernel.org Thu Jan 19 09:30:47 2006 +Date: Thu, 19 Jan 2006 17:29:52 +0000 +From: Ralf Baechle DL5RB +To: stable@kernel.org +Message-ID: <20060119172952.GA15302@linux-mips.org> +Content-Disposition: inline +Cc: +Subject: Fix mkiss locking bug + +ax_encaps() forgot to drop the bufferlock at the end of the function. +Patch is already in 2.6.16-rc1. + +Signed-off-by: Ralf Baechle DL5RB +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/hamradio/mkiss.c | 1 + + 1 file changed, 1 insertion(+) + +--- linux-2.6.15.1.orig/drivers/net/hamradio/mkiss.c ++++ linux-2.6.15.1/drivers/net/hamradio/mkiss.c +@@ -515,6 +515,7 @@ static void ax_encaps(struct net_device + count = kiss_esc(p, (unsigned char *)ax->xbuff, len); + } + } ++ spin_unlock_bh(&ax->buflock); + + set_bit(TTY_DO_WRITE_WAKEUP, &ax->tty->flags); + actual = ax->tty->driver->write(ax->tty, ax->xbuff, count); diff --git a/queue/series b/queue/series index 6de8bb08a2c..b792260ea21 100644 --- a/queue/series +++ b/queue/series @@ -10,3 +10,4 @@ mask-off-GFP-flags-before-swiotlb_alloc_coherent.patch pci-handle-bogus-mcfg-entries.patch someone-broke-reiserfs-v3-mount-options-and-this-fixes-it.patch fix-i2o_scsi-oops-on-abort.patch +fix-mkiss-locking-bug.patch