From: Greg Kroah-Hartman Date: Tue, 23 Jul 2019 10:24:42 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v5.2.3~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94a541a2612ec2ebe4460c8e1d6ead479a504bc4;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: alsa-seq-break-too-long-mutex-context-in-the-write-loop.patch lib-scatterlist-fix-mapping-iterator-when-sg-offset-is-greater-than-page_size.patch media-coda-remove-unbalanced-and-unneeded-mutex-unlock.patch media-v4l2-test-type-instead-of-cfg-type-in-v4l2_ctrl_new_custom.patch nfsv4-handle-the-special-linux-file-open-access-mode.patch tracing-snapshot-resize-spare-buffer-if-size-changed.patch --- diff --git a/queue-4.4/alsa-seq-break-too-long-mutex-context-in-the-write-loop.patch b/queue-4.4/alsa-seq-break-too-long-mutex-context-in-the-write-loop.patch new file mode 100644 index 00000000000..a5a2aecb024 --- /dev/null +++ b/queue-4.4/alsa-seq-break-too-long-mutex-context-in-the-write-loop.patch @@ -0,0 +1,73 @@ +From ede34f397ddb063b145b9e7d79c6026f819ded13 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Mon, 15 Jul 2019 22:50:27 +0200 +Subject: ALSA: seq: Break too long mutex context in the write loop + +From: Takashi Iwai + +commit ede34f397ddb063b145b9e7d79c6026f819ded13 upstream. + +The fix for the racy writes and ioctls to sequencer widened the +application of client->ioctl_mutex to the whole write loop. Although +it does unlock/relock for the lengthy operation like the event dup, +the loop keeps the ioctl_mutex for the whole time in other +situations. This may take quite long time if the user-space would +give a huge buffer, and this is a likely cause of some weird behavior +spotted by syzcaller fuzzer. + +This patch puts a simple workaround, just adding a mutex break in the +loop when a large number of events have been processed. This +shouldn't hit any performance drop because the threshold is set high +enough for usual operations. + +Fixes: 7bd800915677 ("ALSA: seq: More protection for concurrent write and ioctl races") +Reported-by: syzbot+97aae04ce27e39cbfca9@syzkaller.appspotmail.com +Reported-by: syzbot+4c595632b98bb8ffcc66@syzkaller.appspotmail.com +Cc: +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/core/seq/seq_clientmgr.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +--- a/sound/core/seq/seq_clientmgr.c ++++ b/sound/core/seq/seq_clientmgr.c +@@ -1014,7 +1014,7 @@ static ssize_t snd_seq_write(struct file + { + struct snd_seq_client *client = file->private_data; + int written = 0, len; +- int err; ++ int err, handled; + struct snd_seq_event event; + + if (!(snd_seq_file_flags(file) & SNDRV_SEQ_LFLG_OUTPUT)) +@@ -1027,6 +1027,8 @@ static ssize_t snd_seq_write(struct file + if (!client->accept_output || client->pool == NULL) + return -ENXIO; + ++ repeat: ++ handled = 0; + /* allocate the pool now if the pool is not allocated yet */ + mutex_lock(&client->ioctl_mutex); + if (client->pool->size > 0 && !snd_seq_write_pool_allocated(client)) { +@@ -1086,12 +1088,19 @@ static ssize_t snd_seq_write(struct file + 0, 0, &client->ioctl_mutex); + if (err < 0) + break; ++ handled++; + + __skip_event: + /* Update pointers and counts */ + count -= len; + buf += len; + written += len; ++ ++ /* let's have a coffee break if too many events are queued */ ++ if (++handled >= 200) { ++ mutex_unlock(&client->ioctl_mutex); ++ goto repeat; ++ } + } + + out: diff --git a/queue-4.4/lib-scatterlist-fix-mapping-iterator-when-sg-offset-is-greater-than-page_size.patch b/queue-4.4/lib-scatterlist-fix-mapping-iterator-when-sg-offset-is-greater-than-page_size.patch new file mode 100644 index 00000000000..8434074e4b7 --- /dev/null +++ b/queue-4.4/lib-scatterlist-fix-mapping-iterator-when-sg-offset-is-greater-than-page_size.patch @@ -0,0 +1,57 @@ +From aeb87246537a83c2aff482f3f34a2e0991e02cbc Mon Sep 17 00:00:00 2001 +From: Christophe Leroy +Date: Mon, 24 Jun 2019 07:20:14 +0000 +Subject: lib/scatterlist: Fix mapping iterator when sg->offset is greater than PAGE_SIZE + +From: Christophe Leroy + +commit aeb87246537a83c2aff482f3f34a2e0991e02cbc upstream. + +All mapping iterator logic is based on the assumption that sg->offset +is always lower than PAGE_SIZE. + +But there are situations where sg->offset is such that the SG item +is on the second page. In that case sg_copy_to_buffer() fails +properly copying the data into the buffer. One of the reason is +that the data will be outside the kmapped area used to access that +data. + +This patch fixes the issue by adjusting the mapping iterator +offset and pgoffset fields such that offset is always lower than +PAGE_SIZE. + +Signed-off-by: Christophe Leroy +Fixes: 4225fc8555a9 ("lib/scatterlist: use page iterator in the mapping iterator") +Cc: stable@vger.kernel.org +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + lib/scatterlist.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/lib/scatterlist.c ++++ b/lib/scatterlist.c +@@ -496,17 +496,18 @@ static bool sg_miter_get_next_page(struc + { + if (!miter->__remaining) { + struct scatterlist *sg; +- unsigned long pgoffset; + + if (!__sg_page_iter_next(&miter->piter)) + return false; + + sg = miter->piter.sg; +- pgoffset = miter->piter.sg_pgoffset; + +- miter->__offset = pgoffset ? 0 : sg->offset; ++ miter->__offset = miter->piter.sg_pgoffset ? 0 : sg->offset; ++ miter->piter.sg_pgoffset += miter->__offset >> PAGE_SHIFT; ++ miter->__offset &= PAGE_SIZE - 1; + miter->__remaining = sg->offset + sg->length - +- (pgoffset << PAGE_SHIFT) - miter->__offset; ++ (miter->piter.sg_pgoffset << PAGE_SHIFT) - ++ miter->__offset; + miter->__remaining = min_t(unsigned long, miter->__remaining, + PAGE_SIZE - miter->__offset); + } diff --git a/queue-4.4/media-coda-remove-unbalanced-and-unneeded-mutex-unlock.patch b/queue-4.4/media-coda-remove-unbalanced-and-unneeded-mutex-unlock.patch new file mode 100644 index 00000000000..d996c9a5b69 --- /dev/null +++ b/queue-4.4/media-coda-remove-unbalanced-and-unneeded-mutex-unlock.patch @@ -0,0 +1,36 @@ +From 766b9b168f6c75c350dd87c3e0bc6a9b322f0013 Mon Sep 17 00:00:00 2001 +From: Ezequiel Garcia +Date: Thu, 2 May 2019 18:00:43 -0400 +Subject: media: coda: Remove unbalanced and unneeded mutex unlock + +From: Ezequiel Garcia + +commit 766b9b168f6c75c350dd87c3e0bc6a9b322f0013 upstream. + +The mutex unlock in the threaded interrupt handler is not paired +with any mutex lock. Remove it. + +This bug has been here for a really long time, so it applies +to any stable repo. + +Reviewed-by: Philipp Zabel +Signed-off-by: Ezequiel Garcia +Signed-off-by: Hans Verkuil +Cc: stable@vger.kernel.org +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/media/platform/coda/coda-bit.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/media/platform/coda/coda-bit.c ++++ b/drivers/media/platform/coda/coda-bit.c +@@ -2107,7 +2107,6 @@ irqreturn_t coda_irq_handler(int irq, vo + if (ctx == NULL) { + v4l2_err(&dev->v4l2_dev, + "Instance released before the end of transaction\n"); +- mutex_unlock(&dev->coda_mutex); + return IRQ_HANDLED; + } + diff --git a/queue-4.4/media-v4l2-test-type-instead-of-cfg-type-in-v4l2_ctrl_new_custom.patch b/queue-4.4/media-v4l2-test-type-instead-of-cfg-type-in-v4l2_ctrl_new_custom.patch new file mode 100644 index 00000000000..aa3b1c03645 --- /dev/null +++ b/queue-4.4/media-v4l2-test-type-instead-of-cfg-type-in-v4l2_ctrl_new_custom.patch @@ -0,0 +1,47 @@ +From 07d89227a983df957a6a7c56f7c040cde9ac571f Mon Sep 17 00:00:00 2001 +From: Boris Brezillon +Date: Wed, 19 Jun 2019 05:21:33 -0400 +Subject: media: v4l2: Test type instead of cfg->type in v4l2_ctrl_new_custom() + +From: Boris Brezillon + +commit 07d89227a983df957a6a7c56f7c040cde9ac571f upstream. + +cfg->type can be overridden by v4l2_ctrl_fill() and the new value is +stored in the local type var. Fix the tests to use this local var. + +Fixes: 0996517cf8ea ("V4L/DVB: v4l2: Add new control handling framework") +Cc: +Signed-off-by: Boris Brezillon +[hverkuil-cisco@xs4all.nl: change to !qmenu and !qmenu_int (checkpatch)] +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/media/v4l2-core/v4l2-ctrls.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +--- a/drivers/media/v4l2-core/v4l2-ctrls.c ++++ b/drivers/media/v4l2-core/v4l2-ctrls.c +@@ -2073,16 +2073,15 @@ struct v4l2_ctrl *v4l2_ctrl_new_custom(s + v4l2_ctrl_fill(cfg->id, &name, &type, &min, &max, &step, + &def, &flags); + +- is_menu = (cfg->type == V4L2_CTRL_TYPE_MENU || +- cfg->type == V4L2_CTRL_TYPE_INTEGER_MENU); ++ is_menu = (type == V4L2_CTRL_TYPE_MENU || ++ type == V4L2_CTRL_TYPE_INTEGER_MENU); + if (is_menu) + WARN_ON(step); + else + WARN_ON(cfg->menu_skip_mask); +- if (cfg->type == V4L2_CTRL_TYPE_MENU && qmenu == NULL) ++ if (type == V4L2_CTRL_TYPE_MENU && !qmenu) { + qmenu = v4l2_ctrl_get_menu(cfg->id); +- else if (cfg->type == V4L2_CTRL_TYPE_INTEGER_MENU && +- qmenu_int == NULL) { ++ } else if (type == V4L2_CTRL_TYPE_INTEGER_MENU && !qmenu_int) { + handler_set_err(hdl, -EINVAL); + return NULL; + } diff --git a/queue-4.4/nfsv4-handle-the-special-linux-file-open-access-mode.patch b/queue-4.4/nfsv4-handle-the-special-linux-file-open-access-mode.patch new file mode 100644 index 00000000000..33a0f7c8a87 --- /dev/null +++ b/queue-4.4/nfsv4-handle-the-special-linux-file-open-access-mode.patch @@ -0,0 +1,49 @@ +From 44942b4e457beda00981f616402a1a791e8c616e Mon Sep 17 00:00:00 2001 +From: Trond Myklebust +Date: Thu, 27 Jun 2019 06:41:45 -0400 +Subject: NFSv4: Handle the special Linux file open access mode + +From: Trond Myklebust + +commit 44942b4e457beda00981f616402a1a791e8c616e upstream. + +According to the open() manpage, Linux reserves the access mode 3 +to mean "check for read and write permission on the file and return +a file descriptor that can't be used for reading or writing." + +Currently, the NFSv4 code will ask the server to open the file, +and will use an incorrect share access mode of 0. Since it has +an incorrect share access mode, the client later forgets to send +a corresponding close, meaning it can leak stateids on the server. + +Fixes: ce4ef7c0a8a05 ("NFS: Split out NFS v4 file operations") +Cc: stable@vger.kernel.org # 3.6+ +Signed-off-by: Trond Myklebust +Signed-off-by: Greg Kroah-Hartman + +--- + fs/nfs/inode.c | 1 + + fs/nfs/nfs4file.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +--- a/fs/nfs/inode.c ++++ b/fs/nfs/inode.c +@@ -935,6 +935,7 @@ int nfs_open(struct inode *inode, struct + nfs_fscache_open_file(inode, filp); + return 0; + } ++EXPORT_SYMBOL_GPL(nfs_open); + + /* + * This function is called whenever some part of NFS notices that +--- a/fs/nfs/nfs4file.c ++++ b/fs/nfs/nfs4file.c +@@ -49,7 +49,7 @@ nfs4_file_open(struct inode *inode, stru + return err; + + if ((openflags & O_ACCMODE) == 3) +- openflags--; ++ return nfs_open(inode, filp); + + /* We can't create new files here */ + openflags &= ~(O_CREAT|O_EXCL); diff --git a/queue-4.4/series b/queue-4.4/series index 6ab9f0f6965..2662fa6dd75 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -65,3 +65,9 @@ input-gtco-bounds-check-collection-indent-level.patch input-alps-don-t-handle-alps-cs19-trackpoint-only-device.patch input-alps-fix-a-mismatch-between-a-condition-check-and-its-comment.patch regulator-s2mps11-fix-buck7-and-buck8-wrong-voltages.patch +tracing-snapshot-resize-spare-buffer-if-size-changed.patch +nfsv4-handle-the-special-linux-file-open-access-mode.patch +lib-scatterlist-fix-mapping-iterator-when-sg-offset-is-greater-than-page_size.patch +alsa-seq-break-too-long-mutex-context-in-the-write-loop.patch +media-v4l2-test-type-instead-of-cfg-type-in-v4l2_ctrl_new_custom.patch +media-coda-remove-unbalanced-and-unneeded-mutex-unlock.patch diff --git a/queue-4.4/tracing-snapshot-resize-spare-buffer-if-size-changed.patch b/queue-4.4/tracing-snapshot-resize-spare-buffer-if-size-changed.patch new file mode 100644 index 00000000000..4dede838fa7 --- /dev/null +++ b/queue-4.4/tracing-snapshot-resize-spare-buffer-if-size-changed.patch @@ -0,0 +1,108 @@ +From 46cc0b44428d0f0e81f11ea98217fc0edfbeab07 Mon Sep 17 00:00:00 2001 +From: Eiichi Tsukata +Date: Tue, 25 Jun 2019 10:29:10 +0900 +Subject: tracing/snapshot: Resize spare buffer if size changed + +From: Eiichi Tsukata + +commit 46cc0b44428d0f0e81f11ea98217fc0edfbeab07 upstream. + +Current snapshot implementation swaps two ring_buffers even though their +sizes are different from each other, that can cause an inconsistency +between the contents of buffer_size_kb file and the current buffer size. + +For example: + + # cat buffer_size_kb + 7 (expanded: 1408) + # echo 1 > events/enable + # grep bytes per_cpu/cpu0/stats + bytes: 1441020 + # echo 1 > snapshot // current:1408, spare:1408 + # echo 123 > buffer_size_kb // current:123, spare:1408 + # echo 1 > snapshot // current:1408, spare:123 + # grep bytes per_cpu/cpu0/stats + bytes: 1443700 + # cat buffer_size_kb + 123 // != current:1408 + +And also, a similar per-cpu case hits the following WARNING: + +Reproducer: + + # echo 1 > per_cpu/cpu0/snapshot + # echo 123 > buffer_size_kb + # echo 1 > per_cpu/cpu0/snapshot + +WARNING: + + WARNING: CPU: 0 PID: 1946 at kernel/trace/trace.c:1607 update_max_tr_single.part.0+0x2b8/0x380 + Modules linked in: + CPU: 0 PID: 1946 Comm: bash Not tainted 5.2.0-rc6 #20 + Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-2.fc30 04/01/2014 + RIP: 0010:update_max_tr_single.part.0+0x2b8/0x380 + Code: ff e8 dc da f9 ff 0f 0b e9 88 fe ff ff e8 d0 da f9 ff 44 89 ee bf f5 ff ff ff e8 33 dc f9 ff 41 83 fd f5 74 96 e8 b8 da f9 ff <0f> 0b eb 8d e8 af da f9 ff 0f 0b e9 bf fd ff ff e8 a3 da f9 ff 48 + RSP: 0018:ffff888063e4fca0 EFLAGS: 00010093 + RAX: ffff888066214380 RBX: ffffffff99850fe0 RCX: ffffffff964298a8 + RDX: 0000000000000000 RSI: 00000000fffffff5 RDI: 0000000000000005 + RBP: 1ffff1100c7c9f96 R08: ffff888066214380 R09: ffffed100c7c9f9b + R10: ffffed100c7c9f9a R11: 0000000000000003 R12: 0000000000000000 + R13: 00000000ffffffea R14: ffff888066214380 R15: ffffffff99851060 + FS: 00007f9f8173c700(0000) GS:ffff88806d000000(0000) knlGS:0000000000000000 + CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 + CR2: 0000000000714dc0 CR3: 0000000066fa6000 CR4: 00000000000006f0 + Call Trace: + ? trace_array_printk_buf+0x140/0x140 + ? __mutex_lock_slowpath+0x10/0x10 + tracing_snapshot_write+0x4c8/0x7f0 + ? trace_printk_init_buffers+0x60/0x60 + ? selinux_file_permission+0x3b/0x540 + ? tracer_preempt_off+0x38/0x506 + ? trace_printk_init_buffers+0x60/0x60 + __vfs_write+0x81/0x100 + vfs_write+0x1e1/0x560 + ksys_write+0x126/0x250 + ? __ia32_sys_read+0xb0/0xb0 + ? do_syscall_64+0x1f/0x390 + do_syscall_64+0xc1/0x390 + entry_SYSCALL_64_after_hwframe+0x49/0xbe + +This patch adds resize_buffer_duplicate_size() to check if there is a +difference between current/spare buffer sizes and resize a spare buffer +if necessary. + +Link: http://lkml.kernel.org/r/20190625012910.13109-1-devel@etsukata.com + +Cc: stable@vger.kernel.org +Fixes: ad909e21bbe69 ("tracing: Add internal tracing_snapshot() functions") +Signed-off-by: Eiichi Tsukata +Signed-off-by: Steven Rostedt (VMware) +Signed-off-by: Nobuhiro Iwamatsu +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/trace/trace.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -5406,11 +5406,15 @@ tracing_snapshot_write(struct file *filp + break; + } + #endif +- if (!tr->allocated_snapshot) { ++ if (!tr->allocated_snapshot) ++ ret = resize_buffer_duplicate_size(&tr->max_buffer, ++ &tr->trace_buffer, iter->cpu_file); ++ else + ret = alloc_snapshot(tr); +- if (ret < 0) +- break; +- } ++ ++ if (ret < 0) ++ break; ++ + local_irq_disable(); + /* Now, we're going to swap */ + if (iter->cpu_file == RING_BUFFER_ALL_CPUS)