From: Greg Kroah-Hartman Date: Tue, 31 Jan 2006 06:34:31 +0000 (-0800) Subject: 2.6.15.2 release X-Git-Tag: v2.6.14.7~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4ccda0c508972c8a2dc2e063bfc40b0fe1c8f29;p=thirdparty%2Fkernel%2Fstable-queue.git 2.6.15.2 release --- diff --git a/review/2.6.15.2-review.mbox b/2.6.15.2/2.6.15.2-review.mbox similarity index 100% rename from review/2.6.15.2-review.mbox rename to 2.6.15.2/2.6.15.2-review.mbox diff --git a/2.6.15.2/applied.mbox b/2.6.15.2/applied.mbox new file mode 100644 index 00000000000..37d3fc345f0 --- /dev/null +++ b/2.6.15.2/applied.mbox @@ -0,0 +1,622 @@ +From stable-bounces@linux.kernel.org Thu Jan 12 00:48:57 2006 +Date: Thu, 12 Jan 2006 09:44:29 +0100 +Message-id: <20060112084429.GA18332@turing.informatik.uni-halle.de> +From: Clemens Ladisch +To: stable@kernel.org +Cc: Takashi Iwai , alsa-devel@lists.sourceforge.net +Subject: [PATCH] usb-audio: don't use empty packets at start of playback + +Some widespread USB interface chips with adaptive iso endpoints hang +after receiving a series of empty packets when they expect data. This +completely disables audio playback on those devices. To avoid this, we +have to send packets containing silence (zero samples) instead. + +ALSA bug: http://bugtrack.alsa-project.org/alsa-bug/view.php?id=1585 + +Signed-off-by: Clemens Ladisch +Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman +--- + sound/usb/usbaudio.c | 26 +++++++++++++++++++++----- + 1 file changed, 21 insertions(+), 5 deletions(-) + +--- linux-2.6.15.1.orig/sound/usb/usbaudio.c ++++ linux-2.6.15.1/sound/usb/usbaudio.c +@@ -480,22 +480,38 @@ static int retire_playback_sync_urb_hs(s + /* + * Prepare urb for streaming before playback starts. + * +- * We don't care about (or have) any data, so we just send a transfer delimiter. ++ * We don't yet have data, so we send a frame of silence. + */ + static int prepare_startup_playback_urb(snd_usb_substream_t *subs, + snd_pcm_runtime_t *runtime, + struct urb *urb) + { +- unsigned int i; ++ unsigned int i, offs, counts; + snd_urb_ctx_t *ctx = urb->context; ++ int stride = runtime->frame_bits >> 3; + ++ offs = 0; + urb->dev = ctx->subs->dev; + urb->number_of_packets = subs->packs_per_ms; + for (i = 0; i < subs->packs_per_ms; ++i) { +- urb->iso_frame_desc[i].offset = 0; +- urb->iso_frame_desc[i].length = 0; ++ /* calculate the size of a packet */ ++ if (subs->fill_max) ++ counts = subs->maxframesize; /* fixed */ ++ else { ++ subs->phase = (subs->phase & 0xffff) ++ + (subs->freqm << subs->datainterval); ++ counts = subs->phase >> 16; ++ if (counts > subs->maxframesize) ++ counts = subs->maxframesize; ++ } ++ urb->iso_frame_desc[i].offset = offs * stride; ++ urb->iso_frame_desc[i].length = counts * stride; ++ offs += counts; + } +- urb->transfer_buffer_length = 0; ++ urb->transfer_buffer_length = offs * stride; ++ memset(urb->transfer_buffer, ++ subs->cur_audiofmt->format == SNDRV_PCM_FORMAT_U8 ? 0x80 : 0, ++ offs * stride); + return 0; + } + +From stable-bounces@linux.kernel.org Thu Jan 12 19:27:22 2006 +Date: Mon, 9 Jan 2006 11:15:33 -0800 +From: Linux Kernel Mailing List +Subject: [BLOCK] Kill blk_attempt_remerge() +Content-Length: 3139 +Lines: 86 + +From: Jens Axboe + +[BLOCK] Kill blk_attempt_remerge() + +It's a broken interface, it's done way too late. And apparently it triggers +slab problems in recent kernels as well (most likely after the generic dispatch +code was merged). So kill it, ide-cd is the only user of it. + +Signed-off-by: Jens Axboe +chrisw: backport to 2.6.15 tree +Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman +--- + block/ll_rw_blk.c | 24 ------------------------ + drivers/ide/ide-cd.c | 10 ---------- + include/linux/blkdev.h | 1 - + 3 files changed, 35 deletions(-) + +--- linux-2.6.15.1.orig/block/ll_rw_blk.c ++++ linux-2.6.15.1/block/ll_rw_blk.c +@@ -2609,30 +2609,6 @@ static inline int attempt_front_merge(re + return 0; + } + +-/** +- * blk_attempt_remerge - attempt to remerge active head with next request +- * @q: The &request_queue_t belonging to the device +- * @rq: The head request (usually) +- * +- * Description: +- * For head-active devices, the queue can easily be unplugged so quickly +- * that proper merging is not done on the front request. This may hurt +- * performance greatly for some devices. The block layer cannot safely +- * do merging on that first request for these queues, but the driver can +- * call this function and make it happen any way. Only the driver knows +- * when it is safe to do so. +- **/ +-void blk_attempt_remerge(request_queue_t *q, struct request *rq) +-{ +- unsigned long flags; +- +- spin_lock_irqsave(q->queue_lock, flags); +- attempt_back_merge(q, rq); +- spin_unlock_irqrestore(q->queue_lock, flags); +-} +- +-EXPORT_SYMBOL(blk_attempt_remerge); +- + static int __make_request(request_queue_t *q, struct bio *bio) + { + struct request *req; +--- linux-2.6.15.1.orig/drivers/ide/ide-cd.c ++++ linux-2.6.15.1/drivers/ide/ide-cd.c +@@ -1332,8 +1332,6 @@ static ide_startstop_t cdrom_start_read + if (cdrom_read_from_buffer(drive)) + return ide_stopped; + +- blk_attempt_remerge(drive->queue, rq); +- + /* Clear the local sector buffer. */ + info->nsectors_buffered = 0; + +@@ -1874,14 +1872,6 @@ static ide_startstop_t cdrom_start_write + return ide_stopped; + } + +- /* +- * for dvd-ram and such media, it's a really big deal to get +- * big writes all the time. so scour the queue and attempt to +- * remerge requests, often the plugging will not have had time +- * to do this properly +- */ +- blk_attempt_remerge(drive->queue, rq); +- + info->nsectors_buffered = 0; + + /* use dma, if possible. we don't need to check more, since we +--- linux-2.6.15.1.orig/include/linux/blkdev.h ++++ linux-2.6.15.1/include/linux/blkdev.h +@@ -559,7 +559,6 @@ extern void register_disk(struct gendisk + extern void generic_make_request(struct bio *bio); + extern void blk_put_request(struct request *); + extern void blk_end_sync_rq(struct request *rq); +-extern void blk_attempt_remerge(request_queue_t *, struct request *); + extern struct request *blk_get_request(request_queue_t *, int, gfp_t); + extern void blk_insert_request(request_queue_t *, struct request *, int, void *); + extern void blk_requeue_request(request_queue_t *, struct request *); +From stable-bounces@linux.kernel.org Sat Jan 14 14:01:19 2006 +From: Dmitry Torokhov +To: stable@kernel.org +Date: Sat, 14 Jan 2006 16:56:49 -0500 +Subject: Input: HID - fix an oops in PID initialization code +Content-Length: 808 +Lines: 19 + +Input: HID - fix an oops in PID initialization code + +Signed-off-by: Dmitry Torokhov +Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/input/pid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.15.1.orig/drivers/usb/input/pid.c ++++ linux-2.6.15.1/drivers/usb/input/pid.c +@@ -259,7 +259,7 @@ static int hid_pid_upload_effect(struct + int hid_pid_init(struct hid_device *hid) + { + struct hid_ff_pid *private; +- struct hid_input *hidinput = list_entry(&hid->inputs, struct hid_input, list); ++ struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list); + struct input_dev *input_dev = hidinput->input; + + private = hid->ff_private = kzalloc(sizeof(struct hid_ff_pid), GFP_KERNEL); +From nobody Mon Sep 17 00:00:00 2001 +Subject: [PATCH] Fix double decrement of mqueue_mnt->mnt_count in sys_mq_open (CVE-2005-3356) +From: Alexander Viro +Date: 1137270595 -0500 +Content-Length: 3800 +Lines: 133 + +Fixed the refcounting on failure exits in sys_mq_open() and +cleaned the logics up. Rules are actually pretty simple - dentry_open() +expects vfsmount and dentry to be pinned down and it either transfers +them into created struct file or drops them. Old code had been very +confused in that area - if dentry_open() had failed either in do_open() +or do_create(), we ended up dentry and mqueue_mnt dropped twice, once +by dentry_open() cleanup and then by sys_mq_open(). + +Fix consists of making the rules for do_create() and do_open() +same as for dentry_open() and updating the sys_mq_open() accordingly; +that actually leads to more straightforward code and less work on +normal path. + +Signed-off-by: Al Viro +Signed-off-by: Linus Torvalds +Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman +--- + ipc/mqueue.c | 59 +++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 33 insertions(+), 26 deletions(-) + +--- linux-2.6.15.1.orig/ipc/mqueue.c ++++ linux-2.6.15.1/ipc/mqueue.c +@@ -598,15 +598,16 @@ static int mq_attr_ok(struct mq_attr *at + static struct file *do_create(struct dentry *dir, struct dentry *dentry, + int oflag, mode_t mode, struct mq_attr __user *u_attr) + { +- struct file *filp; + struct mq_attr attr; + int ret; + +- if (u_attr != NULL) { ++ if (u_attr) { ++ ret = -EFAULT; + if (copy_from_user(&attr, u_attr, sizeof(attr))) +- return ERR_PTR(-EFAULT); ++ goto out; ++ ret = -EINVAL; + if (!mq_attr_ok(&attr)) +- return ERR_PTR(-EINVAL); ++ goto out; + /* store for use during create */ + dentry->d_fsdata = &attr; + } +@@ -615,13 +616,14 @@ static struct file *do_create(struct den + ret = vfs_create(dir->d_inode, dentry, mode, NULL); + dentry->d_fsdata = NULL; + if (ret) +- return ERR_PTR(ret); ++ goto out; + +- filp = dentry_open(dentry, mqueue_mnt, oflag); +- if (!IS_ERR(filp)) +- dget(dentry); ++ return dentry_open(dentry, mqueue_mnt, oflag); + +- return filp; ++out: ++ dput(dentry); ++ mntput(mqueue_mnt); ++ return ERR_PTR(ret); + } + + /* Opens existing queue */ +@@ -629,20 +631,20 @@ static struct file *do_open(struct dentr + { + static int oflag2acc[O_ACCMODE] = { MAY_READ, MAY_WRITE, + MAY_READ | MAY_WRITE }; +- struct file *filp; + +- if ((oflag & O_ACCMODE) == (O_RDWR | O_WRONLY)) ++ if ((oflag & O_ACCMODE) == (O_RDWR | O_WRONLY)) { ++ dput(dentry); ++ mntput(mqueue_mnt); + return ERR_PTR(-EINVAL); ++ } + +- if (permission(dentry->d_inode, oflag2acc[oflag & O_ACCMODE], NULL)) ++ if (permission(dentry->d_inode, oflag2acc[oflag & O_ACCMODE], NULL)) { ++ dput(dentry); ++ mntput(mqueue_mnt); + return ERR_PTR(-EACCES); ++ } + +- filp = dentry_open(dentry, mqueue_mnt, oflag); +- +- if (!IS_ERR(filp)) +- dget(dentry); +- +- return filp; ++ return dentry_open(dentry, mqueue_mnt, oflag); + } + + asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode, +@@ -670,17 +672,20 @@ asmlinkage long sys_mq_open(const char _ + + if (oflag & O_CREAT) { + if (dentry->d_inode) { /* entry already exists */ +- filp = (oflag & O_EXCL) ? ERR_PTR(-EEXIST) : +- do_open(dentry, oflag); ++ error = -EEXIST; ++ if (oflag & O_EXCL) ++ goto out; ++ filp = do_open(dentry, oflag); + } else { + filp = do_create(mqueue_mnt->mnt_root, dentry, + oflag, mode, u_attr); + } +- } else +- filp = (dentry->d_inode) ? do_open(dentry, oflag) : +- ERR_PTR(-ENOENT); +- +- dput(dentry); ++ } else { ++ error = -ENOENT; ++ if (!dentry->d_inode) ++ goto out; ++ filp = do_open(dentry, oflag); ++ } + + if (IS_ERR(filp)) { + error = PTR_ERR(filp); +@@ -691,8 +696,10 @@ asmlinkage long sys_mq_open(const char _ + fd_install(fd, filp); + goto out_upsem; + +-out_putfd: ++out: ++ dput(dentry); + mntput(mqueue_mnt); ++out_putfd: + put_unused_fd(fd); + out_err: + fd = error; +From nobody Mon Sep 17 00:00:00 2001 +Subject: [PATCH] Fix oops in ufs_fill_super at mount time +From: Evgeniy +Date: 1137165135 +0300 +Content-Length: 1211 +Lines: 28 + +There's a lack of parenthesis in fs/ufs/utils.h, so instead of the 512th +byte of buffer, the usb2 pointer will point to the nth structure of type +ufs_super_block_second. + +This can cause a mount-time oops if you're unlucky (especially with +DEBUG_PAGEALLOC, which is how Alexey Dobriyan saw this problem) + +Signed-off-by: Evgeniy Dushistov +Acked-by: Alexey Dobriyan +Signed-off-by: Linus Torvalds +Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman +--- + fs/ufs/util.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- linux-2.6.15.1.orig/fs/ufs/util.h ++++ linux-2.6.15.1/fs/ufs/util.h +@@ -255,8 +255,8 @@ extern void _ubh_memcpyubh_(struct ufs_s + ((struct ufs_super_block_first *)((ubh)->bh[0]->b_data)) + + #define ubh_get_usb_second(ubh) \ +- ((struct ufs_super_block_second *)(ubh)-> \ +- bh[UFS_SECTOR_SIZE >> uspi->s_fshift]->b_data + (UFS_SECTOR_SIZE & ~uspi->s_fmask)) ++ ((struct ufs_super_block_second *)((ubh)->\ ++ bh[UFS_SECTOR_SIZE >> uspi->s_fshift]->b_data + (UFS_SECTOR_SIZE & ~uspi->s_fmask))) + + #define ubh_get_usb_third(ubh) \ + ((struct ufs_super_block_third *)((ubh)-> \ +From stable-bounces@linux.kernel.org Tue Jan 17 15:27:59 2006 +Date: Tue, 17 Jan 2006 15:23:00 -0800 (PST) +Message-Id: <20060117.152300.10006770.davem@davemloft.net> +To: stable@kernel.org +From: "David S. Miller" +Subject: [PATCH] Fix timekeeping on sparc64 ultra-IIe machines +Content-Length: 2944 +Lines: 75 + +From: Richard Mortimer + +[SPARC64]: Eliminate race condition reading Hummingbird STICK register + +Ensure a consistent value is read from the STICK register by ensuring +that both high and low are read without high changing due to a roll +over of the low register. + +Various Debian/SPARC users (myself include) have noticed problems with +Hummingbird based systems. The symptoms are that the system time is +seen to jump forward 3 days, 6 hours, 11 minutes give or take a few +seconds. In many cases the system then hangs some time afterwards. + +I've spotted a race condition in the code to read the STICK register. +I could not work out why 3d, 6h, 11m is important but guess that it is +due to the 2^32 jump of STICK (forwards on one read and then the next +read will seem to be backwards) during a timer interrupt. I'm guessing +that a change of -2^32 will get converted to a large unsigned +increment after the arithmetic manipulation between STICK, +nanoseconds, jiffies etc. + +I did a test where I modified __hbird_read_stick to artificially +inject rollover faults forcefully every few seconds. With this I saw +the clock jump over 6 times in 12 hours compared to once every month +or so. + +Signed-off-by: Richard Mortimer +Signed-off-by: David S. Miller +Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman +--- + arch/sparc64/kernel/time.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +--- linux-2.6.15.1.orig/arch/sparc64/kernel/time.c ++++ linux-2.6.15.1/arch/sparc64/kernel/time.c +@@ -280,9 +280,9 @@ static struct sparc64_tick_ops stick_ope + * Since STICK is constantly updating, we have to access it carefully. + * + * The sequence we use to read is: +- * 1) read low +- * 2) read high +- * 3) read low again, if it rolled over increment high by 1 ++ * 1) read high ++ * 2) read low ++ * 3) read high again, if it rolled re-read both low and high again. + * + * Writing STICK safely is also tricky: + * 1) write low to zero +@@ -295,18 +295,18 @@ static struct sparc64_tick_ops stick_ope + static unsigned long __hbird_read_stick(void) + { + unsigned long ret, tmp1, tmp2, tmp3; +- unsigned long addr = HBIRD_STICK_ADDR; ++ unsigned long addr = HBIRD_STICK_ADDR+8; + +- __asm__ __volatile__("ldxa [%1] %5, %2\n\t" +- "add %1, 0x8, %1\n\t" +- "ldxa [%1] %5, %3\n\t" ++ __asm__ __volatile__("ldxa [%1] %5, %2\n" ++ "1:\n\t" + "sub %1, 0x8, %1\n\t" ++ "ldxa [%1] %5, %3\n\t" ++ "add %1, 0x8, %1\n\t" + "ldxa [%1] %5, %4\n\t" + "cmp %4, %2\n\t" +- "blu,a,pn %%xcc, 1f\n\t" +- " add %3, 1, %3\n" +- "1:\n\t" +- "sllx %3, 32, %3\n\t" ++ "bne,a,pn %%xcc, 1b\n\t" ++ " mov %4, %2\n\t" ++ "sllx %4, 32, %4\n\t" + "or %3, %4, %0\n\t" + : "=&r" (ret), "=&r" (addr), + "=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3) +From stable-bounces@linux.kernel.org Fri Jan 20 04:37:22 2006 +Date: Fri, 20 Jan 2006 04:31:34 -0800 +From: Andrew Morton +To: stable@kernel.org +Message-Id: <20060120043134.65a14bfd.akpm@osdl.org> +Cc: "David S. Miller" +Subject: [NET]: Make second arg to skb_reserved() signed. +Content-Length: 965 +Lines: 26 + +From: David S. Miller + +Some subsystems, such as PPP, can send negative values +here. It just happened to work correctly on 32-bit with +an unsigned value, but on 64-bit this explodes. + +Figured out by Paul Mackerras based upon several PPP crash +reports. + +Signed-off-by: David S. Miller +Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/skbuff.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.15.1.orig/include/linux/skbuff.h ++++ linux-2.6.15.1/include/linux/skbuff.h +@@ -927,7 +927,7 @@ static inline int skb_tailroom(const str + * Increase the headroom of an empty &sk_buff by reducing the tail + * room. This is only allowed for an empty buffer. + */ +-static inline void skb_reserve(struct sk_buff *skb, unsigned int len) ++static inline void skb_reserve(struct sk_buff *skb, int len) + { + skb->data += len; + skb->tail += len; +From stable-bounces@linux.kernel.org Sat Jan 21 13:18:41 2006 +Date: Sat, 21 Jan 2006 13:13:13 -0800 +From: Andrew Morton +To: stable@kernel.org +Message-Id: <20060121131313.551c624f.akpm@osdl.org> +Cc: Andi Kleen +Subject: [PATCH] Mask off GFP flags before swiotlb_alloc_coherent +Content-Length: 623 +Lines: 20 + +From: Andi Kleen + +Mask off GFP flags before swiotlb_alloc_coherent + +Signed-off-by: Andi Kleen +Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86_64/kernel/pci-gart.c | 1 + + 1 file changed, 1 insertion(+) + +--- linux-2.6.15.1.orig/arch/x86_64/kernel/pci-gart.c ++++ linux-2.6.15.1/arch/x86_64/kernel/pci-gart.c +@@ -244,6 +244,7 @@ dma_alloc_coherent(struct device *dev, s + get_order(size)); + + if (swiotlb) { ++ gfp &= ~(GFP_DMA32|GFP_DMA); + return + swiotlb_alloc_coherent(dev, size, + dma_handle, +From stable-bounces@linux.kernel.org Thu Jan 19 23:06:22 2006 +Message-Id: <200601200706.k0K76Fho019101@shell0.pdx.osdl.net> +To: vitaly@namesys.com, reiser@namesys.com, stable@kernel.org, + mm-commits@vger.kernel.org +From: akpm@osdl.org +Date: Thu, 19 Jan 2006 23:06:01 -0800 +Cc: +Subject: Someone broke reiserfs v3 mount options and this fixes it +Content-Length: 712 +Lines: 20 + +From: Vitaly Fertman + +Signed-off-by: Hans Reiser +Signed-off-by: Vitaly Fertman +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/reiserfs/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.15.1.orig/fs/reiserfs/super.c ++++ linux-2.6.15.1/fs/reiserfs/super.c +@@ -1131,7 +1131,7 @@ static void handle_attrs(struct super_bl + REISERFS_SB(s)->s_mount_opt &= ~(1 << REISERFS_ATTRS); + } + } else if (le32_to_cpu(rs->s_flags) & reiserfs_attrs_cleared) { +- REISERFS_SB(s)->s_mount_opt |= REISERFS_ATTRS; ++ REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_ATTRS); + } + } + +From stable-bounces@linux.kernel.org Thu Jan 19 14:02:44 2006 +Message-Id: <200601192201.k0JM141O030124@shell0.pdx.osdl.net> +To: theonetruekenny@yahoo.com, Markus.Lidel@shadowconnect.com, + stable@kernel.org, mm-commits@vger.kernel.org +From: akpm@osdl.org +Date: Thu, 19 Jan 2006 14:03:04 -0800 +Cc: +Subject: Fix i2o_scsi oops on abort +Content-Length: 1001 +Lines: 27 + +From: Markus Lidel + +>From http://bugzilla.kernel.org/show_bug.cgi?id=5923 + +When a scsi command failed, an oops would result. + +Back-to-back SMART queries would make the Seagate drives unhappy. The +second SMART query would timeout, and the command would be aborted. + +From: Markus Lidel +Cc: Kenny Simpson +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + drivers/message/i2o/i2o_scsi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.15.1.orig/drivers/message/i2o/i2o_scsi.c ++++ linux-2.6.15.1/drivers/message/i2o/i2o_scsi.c +@@ -729,7 +729,7 @@ static int i2o_scsi_abort(struct scsi_cm + &msg->u.head[1]); + writel(i2o_cntxt_list_get_ptr(c, SCpnt), &msg->body[0]); + +- if (i2o_msg_post_wait(c, m, I2O_TIMEOUT_SCSI_SCB_ABORT)) ++ if (!i2o_msg_post_wait(c, msg, I2O_TIMEOUT_SCSI_SCB_ABORT)) + status = SUCCESS; + + return status; +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 +Content-Length: 662 +Lines: 19 + +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/review/elevator-as-back-compatibility.patch b/2.6.15.2/elevator-as-back-compatibility.patch similarity index 100% rename from review/elevator-as-back-compatibility.patch rename to 2.6.15.2/elevator-as-back-compatibility.patch diff --git a/review/fix-double-decrement-of-mqueue_mnt-mnt_count-in-sys_mq_open.patch b/2.6.15.2/fix-double-decrement-of-mqueue_mnt-mnt_count-in-sys_mq_open.patch similarity index 100% rename from review/fix-double-decrement-of-mqueue_mnt-mnt_count-in-sys_mq_open.patch rename to 2.6.15.2/fix-double-decrement-of-mqueue_mnt-mnt_count-in-sys_mq_open.patch diff --git a/review/fix-i2o_scsi-oops-on-abort.patch b/2.6.15.2/fix-i2o_scsi-oops-on-abort.patch similarity index 100% rename from review/fix-i2o_scsi-oops-on-abort.patch rename to 2.6.15.2/fix-i2o_scsi-oops-on-abort.patch diff --git a/review/fix-mkiss-locking-bug.patch b/2.6.15.2/fix-mkiss-locking-bug.patch similarity index 100% rename from review/fix-mkiss-locking-bug.patch rename to 2.6.15.2/fix-mkiss-locking-bug.patch diff --git a/review/fix-oops-in-ufs_fill_super-at-mount-time.patch b/2.6.15.2/fix-oops-in-ufs_fill_super-at-mount-time.patch similarity index 100% rename from review/fix-oops-in-ufs_fill_super-at-mount-time.patch rename to 2.6.15.2/fix-oops-in-ufs_fill_super-at-mount-time.patch diff --git a/review/input-hid-fix-an-oops-in-pid-initialization-code.patch b/2.6.15.2/input-hid-fix-an-oops-in-pid-initialization-code.patch similarity index 100% rename from review/input-hid-fix-an-oops-in-pid-initialization-code.patch rename to 2.6.15.2/input-hid-fix-an-oops-in-pid-initialization-code.patch diff --git a/review/kill-blk_attempt_remerge.patch b/2.6.15.2/kill-blk_attempt_remerge.patch similarity index 100% rename from review/kill-blk_attempt_remerge.patch rename to 2.6.15.2/kill-blk_attempt_remerge.patch diff --git a/review/mask-off-GFP-flags-before-swiotlb_alloc_coherent.patch b/2.6.15.2/mask-off-GFP-flags-before-swiotlb_alloc_coherent.patch similarity index 100% rename from review/mask-off-GFP-flags-before-swiotlb_alloc_coherent.patch rename to 2.6.15.2/mask-off-GFP-flags-before-swiotlb_alloc_coherent.patch diff --git a/review/net-make-second-arg-to-skb_reserved-signed.patch b/2.6.15.2/net-make-second-arg-to-skb_reserved-signed.patch similarity index 100% rename from review/net-make-second-arg-to-skb_reserved-signed.patch rename to 2.6.15.2/net-make-second-arg-to-skb_reserved-signed.patch diff --git a/review/series b/2.6.15.2/series similarity index 100% rename from review/series rename to 2.6.15.2/series diff --git a/review/someone-broke-reiserfs-v3-mount-options-and-this-fixes-it.patch b/2.6.15.2/someone-broke-reiserfs-v3-mount-options-and-this-fixes-it.patch similarity index 100% rename from review/someone-broke-reiserfs-v3-mount-options-and-this-fixes-it.patch rename to 2.6.15.2/someone-broke-reiserfs-v3-mount-options-and-this-fixes-it.patch diff --git a/review/sparc64-fix-timekeeping-on-ultra-IIe-machines.patch b/2.6.15.2/sparc64-fix-timekeeping-on-ultra-IIe-machines.patch similarity index 100% rename from review/sparc64-fix-timekeeping-on-ultra-IIe-machines.patch rename to 2.6.15.2/sparc64-fix-timekeeping-on-ultra-IIe-machines.patch diff --git a/review/usb-audio-dont-use-empty-packets-at-start-of-playback.patch b/2.6.15.2/usb-audio-dont-use-empty-packets-at-start-of-playback.patch similarity index 100% rename from review/usb-audio-dont-use-empty-packets-at-start-of-playback.patch rename to 2.6.15.2/usb-audio-dont-use-empty-packets-at-start-of-playback.patch