From: Greg Kroah-Hartman Date: Mon, 1 Jul 2019 15:24:39 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.1.16~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6d96f65b0d9caf35b5e5fe16ea8fb0eb730e40a;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: dm-log-writes-make-sure-super-sector-log-updates-are-written-in-order.patch mm-page_idle.c-fix-oops-because-end_pfn-is-larger-than-max_pfn.patch scsi-vmw_pscsi-fix-use-after-free-in-pvscsi_queue_lck.patch --- diff --git a/queue-4.14/dm-log-writes-make-sure-super-sector-log-updates-are-written-in-order.patch b/queue-4.14/dm-log-writes-make-sure-super-sector-log-updates-are-written-in-order.patch new file mode 100644 index 00000000000..ac6eed51d5c --- /dev/null +++ b/queue-4.14/dm-log-writes-make-sure-super-sector-log-updates-are-written-in-order.patch @@ -0,0 +1,106 @@ +From 211ad4b733037f66f9be0a79eade3da7ab11cbb8 Mon Sep 17 00:00:00 2001 +From: "zhangyi (F)" +Date: Wed, 5 Jun 2019 21:27:08 +0800 +Subject: dm log writes: make sure super sector log updates are written in order + +From: zhangyi (F) + +commit 211ad4b733037f66f9be0a79eade3da7ab11cbb8 upstream. + +Currently, although we submit super bios in order (and super.nr_entries +is incremented by each logged entry), submit_bio() is async so each +super sector may not be written to log device in order and then the +final nr_entries may be smaller than it should be. + +This problem can be reproduced by the xfstests generic/455 with ext4: + + QA output created by 455 + -Silence is golden + +mark 'end' does not exist + +Fix this by serializing submission of super sectors to make sure each +is written to the log disk in order. + +Fixes: 0e9cebe724597 ("dm: add log writes target") +Cc: stable@vger.kernel.org +Signed-off-by: zhangyi (F) +Suggested-by: Josef Bacik +Reviewed-by: Josef Bacik +Signed-off-by: Mike Snitzer +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/md/dm-log-writes.c | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +--- a/drivers/md/dm-log-writes.c ++++ b/drivers/md/dm-log-writes.c +@@ -57,6 +57,7 @@ + + #define WRITE_LOG_VERSION 1ULL + #define WRITE_LOG_MAGIC 0x6a736677736872ULL ++#define WRITE_LOG_SUPER_SECTOR 0 + + /* + * The disk format for this is braindead simple. +@@ -112,6 +113,7 @@ struct log_writes_c { + struct list_head logging_blocks; + wait_queue_head_t wait; + struct task_struct *log_kthread; ++ struct completion super_done; + }; + + struct pending_block { +@@ -177,6 +179,14 @@ static void log_end_io(struct bio *bio) + bio_put(bio); + } + ++static void log_end_super(struct bio *bio) ++{ ++ struct log_writes_c *lc = bio->bi_private; ++ ++ complete(&lc->super_done); ++ log_end_io(bio); ++} ++ + /* + * Meant to be called if there is an error, it will free all the pages + * associated with the block. +@@ -212,7 +222,8 @@ static int write_metadata(struct log_wri + bio->bi_iter.bi_size = 0; + bio->bi_iter.bi_sector = sector; + bio_set_dev(bio, lc->logdev->bdev); +- bio->bi_end_io = log_end_io; ++ bio->bi_end_io = (sector == WRITE_LOG_SUPER_SECTOR) ? ++ log_end_super : log_end_io; + bio->bi_private = lc; + bio_set_op_attrs(bio, REQ_OP_WRITE, 0); + +@@ -334,11 +345,18 @@ static int log_super(struct log_writes_c + super.nr_entries = cpu_to_le64(lc->logged_entries); + super.sectorsize = cpu_to_le32(lc->sectorsize); + +- if (write_metadata(lc, &super, sizeof(super), NULL, 0, 0)) { ++ if (write_metadata(lc, &super, sizeof(super), NULL, 0, ++ WRITE_LOG_SUPER_SECTOR)) { + DMERR("Couldn't write super"); + return -1; + } + ++ /* ++ * Super sector should be writen in-order, otherwise the ++ * nr_entries could be rewritten incorrectly by an old bio. ++ */ ++ wait_for_completion_io(&lc->super_done); ++ + return 0; + } + +@@ -447,6 +465,7 @@ static int log_writes_ctr(struct dm_targ + INIT_LIST_HEAD(&lc->unflushed_blocks); + INIT_LIST_HEAD(&lc->logging_blocks); + init_waitqueue_head(&lc->wait); ++ init_completion(&lc->super_done); + atomic_set(&lc->io_blocks, 0); + atomic_set(&lc->pending_blocks, 0); + diff --git a/queue-4.14/mm-page_idle.c-fix-oops-because-end_pfn-is-larger-than-max_pfn.patch b/queue-4.14/mm-page_idle.c-fix-oops-because-end_pfn-is-larger-than-max_pfn.patch new file mode 100644 index 00000000000..ce1099463bd --- /dev/null +++ b/queue-4.14/mm-page_idle.c-fix-oops-because-end_pfn-is-larger-than-max_pfn.patch @@ -0,0 +1,85 @@ +From 7298e3b0a149c91323b3205d325e942c3b3b9ef6 Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Fri, 28 Jun 2019 12:07:05 -0700 +Subject: mm/page_idle.c: fix oops because end_pfn is larger than max_pfn + +From: Colin Ian King + +commit 7298e3b0a149c91323b3205d325e942c3b3b9ef6 upstream. + +Currently the calcuation of end_pfn can round up the pfn number to more +than the actual maximum number of pfns, causing an Oops. Fix this by +ensuring end_pfn is never more than max_pfn. + +This can be easily triggered when on systems where the end_pfn gets +rounded up to more than max_pfn using the idle-page stress-ng stress test: + +sudo stress-ng --idle-page 0 + + BUG: unable to handle kernel paging request at 00000000000020d8 + #PF error: [normal kernel read fault] + PGD 0 P4D 0 + Oops: 0000 [#1] SMP PTI + CPU: 1 PID: 11039 Comm: stress-ng-idle- Not tainted 5.0.0-5-generic #6-Ubuntu + Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 + RIP: 0010:page_idle_get_page+0xc8/0x1a0 + Code: 0f b1 0a 75 7d 48 8b 03 48 89 c2 48 c1 e8 33 83 e0 07 48 c1 ea 36 48 8d 0c 40 4c 8d 24 88 49 c1 e4 07 4c 03 24 d5 00 89 c3 be <49> 8b 44 24 58 48 8d b8 80 a1 02 00 e8 07 d5 77 00 48 8b 53 08 48 + RSP: 0018:ffffafd7c672fde8 EFLAGS: 00010202 + RAX: 0000000000000005 RBX: ffffe36341fff700 RCX: 000000000000000f + RDX: 0000000000000284 RSI: 0000000000000275 RDI: 0000000001fff700 + RBP: ffffafd7c672fe00 R08: ffffa0bc34056410 R09: 0000000000000276 + R10: ffffa0bc754e9b40 R11: ffffa0bc330f6400 R12: 0000000000002080 + R13: ffffe36341fff700 R14: 0000000000080000 R15: ffffa0bc330f6400 + FS: 00007f0ec1ea5740(0000) GS:ffffa0bc7db00000(0000) knlGS:0000000000000000 + CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 + CR2: 00000000000020d8 CR3: 0000000077d68000 CR4: 00000000000006e0 + Call Trace: + page_idle_bitmap_write+0x8c/0x140 + sysfs_kf_bin_write+0x5c/0x70 + kernfs_fop_write+0x12e/0x1b0 + __vfs_write+0x1b/0x40 + vfs_write+0xab/0x1b0 + ksys_write+0x55/0xc0 + __x64_sys_write+0x1a/0x20 + do_syscall_64+0x5a/0x110 + entry_SYSCALL_64_after_hwframe+0x44/0xa9 + +Link: http://lkml.kernel.org/r/20190618124352.28307-1-colin.king@canonical.com +Fixes: 33c3fc71c8cf ("mm: introduce idle page tracking") +Signed-off-by: Colin Ian King +Reviewed-by: Andrew Morton +Acked-by: Vladimir Davydov +Cc: Michal Hocko +Cc: Mike Rapoport +Cc: Mel Gorman +Cc: Stephen Rothwell +Cc: Andrey Ryabinin +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/page_idle.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/mm/page_idle.c ++++ b/mm/page_idle.c +@@ -136,7 +136,7 @@ static ssize_t page_idle_bitmap_read(str + + end_pfn = pfn + count * BITS_PER_BYTE; + if (end_pfn > max_pfn) +- end_pfn = ALIGN(max_pfn, BITMAP_CHUNK_BITS); ++ end_pfn = max_pfn; + + for (; pfn < end_pfn; pfn++) { + bit = pfn % BITMAP_CHUNK_BITS; +@@ -181,7 +181,7 @@ static ssize_t page_idle_bitmap_write(st + + end_pfn = pfn + count * BITS_PER_BYTE; + if (end_pfn > max_pfn) +- end_pfn = ALIGN(max_pfn, BITMAP_CHUNK_BITS); ++ end_pfn = max_pfn; + + for (; pfn < end_pfn; pfn++) { + bit = pfn % BITMAP_CHUNK_BITS; diff --git a/queue-4.14/scsi-vmw_pscsi-fix-use-after-free-in-pvscsi_queue_lck.patch b/queue-4.14/scsi-vmw_pscsi-fix-use-after-free-in-pvscsi_queue_lck.patch new file mode 100644 index 00000000000..0cbc089bda7 --- /dev/null +++ b/queue-4.14/scsi-vmw_pscsi-fix-use-after-free-in-pvscsi_queue_lck.patch @@ -0,0 +1,52 @@ +From 240b4cc8fd5db138b675297d4226ec46594d9b3b Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Wed, 19 Jun 2019 09:05:41 +0200 +Subject: scsi: vmw_pscsi: Fix use-after-free in pvscsi_queue_lck() + +From: Jan Kara + +commit 240b4cc8fd5db138b675297d4226ec46594d9b3b upstream. + +Once we unlock adapter->hw_lock in pvscsi_queue_lck() nothing prevents just +queued scsi_cmnd from completing and freeing the request. Thus cmd->cmnd[0] +dereference can dereference already freed request leading to kernel crashes +or other issues (which one of our customers observed). Store cmd->cmnd[0] +in a local variable before unlocking adapter->hw_lock to fix the issue. + +CC: +Signed-off-by: Jan Kara +Reviewed-by: Ewan D. Milne +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/vmw_pvscsi.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/scsi/vmw_pvscsi.c ++++ b/drivers/scsi/vmw_pvscsi.c +@@ -763,6 +763,7 @@ static int pvscsi_queue_lck(struct scsi_ + struct pvscsi_adapter *adapter = shost_priv(host); + struct pvscsi_ctx *ctx; + unsigned long flags; ++ unsigned char op; + + spin_lock_irqsave(&adapter->hw_lock, flags); + +@@ -775,13 +776,14 @@ static int pvscsi_queue_lck(struct scsi_ + } + + cmd->scsi_done = done; ++ op = cmd->cmnd[0]; + + dev_dbg(&cmd->device->sdev_gendev, +- "queued cmd %p, ctx %p, op=%x\n", cmd, ctx, cmd->cmnd[0]); ++ "queued cmd %p, ctx %p, op=%x\n", cmd, ctx, op); + + spin_unlock_irqrestore(&adapter->hw_lock, flags); + +- pvscsi_kick_io(adapter, cmd->cmnd[0]); ++ pvscsi_kick_io(adapter, op); + + return 0; + } diff --git a/queue-4.14/series b/queue-4.14/series index bcdd65f5ec6..8dac5f9ad87 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -16,3 +16,6 @@ revert-compiler.h-update-definition-of-unreachable.patch fs-proc-array.c-allow-reporting-eip-esp-for-all-coredumping-threads.patch mm-mempolicy.c-fix-an-incorrect-rebind-node-in-mpol_rebind_nodemask.patch fs-binfmt_flat.c-make-load_flat_shared_library-work.patch +mm-page_idle.c-fix-oops-because-end_pfn-is-larger-than-max_pfn.patch +dm-log-writes-make-sure-super-sector-log-updates-are-written-in-order.patch +scsi-vmw_pscsi-fix-use-after-free-in-pvscsi_queue_lck.patch