From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Bart Van Assche <bvanassche@acm.org>,
Ming Lei <ming.lei@redhat.com>, Keith Busch <kbusch@kernel.org>,
Johannes Thumshirn <jth@kernel.org>,
Hannes Reinecke <hare@suse.com>,
Christoph Hellwig <hch@infradead.org>,
Jens Axboe <axboe@kernel.dk>, Sasha Levin <sashal@kernel.org>,
linux-block@vger.kernel.org
Subject: [PATCH AUTOSEL 5.6 18/68] blk-mq: Fix a recently introduced regression in blk_mq_realloc_hw_ctxs()
Date: Thu, 9 Apr 2020 23:45:43 -0400 [thread overview]
Message-ID: <20200410034634.7731-18-sashal@kernel.org> (raw)
In-Reply-To: <20200410034634.7731-1-sashal@kernel.org>
From: Bart Van Assche <bvanassche@acm.org>
[ Upstream commit d0930bb8f46b8fb4a7d429c0bf1c91b3ed00a7cf ]
q->nr_hw_queues must only be updated once it is known that
blk_mq_realloc_hw_ctxs() has succeeded. Otherwise it can happen that
reallocation fails and that q->nr_hw_queues is larger than the number of
allocated hardware queues. This patch fixes the following crash if
increasing the number of hardware queues fails:
BUG: KASAN: null-ptr-deref in blk_mq_map_swqueue+0x775/0x810
Write of size 8 at addr 0000000000000118 by task check/977
CPU: 3 PID: 977 Comm: check Not tainted 5.6.0-rc1-dbg+ #8
Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
Call Trace:
dump_stack+0xa5/0xe6
__kasan_report.cold+0x65/0x99
kasan_report+0x16/0x20
check_memory_region+0x140/0x1b0
memset+0x28/0x40
blk_mq_map_swqueue+0x775/0x810
blk_mq_update_nr_hw_queues+0x468/0x710
nullb_device_submit_queues_store+0xf7/0x1a0 [null_blk]
configfs_write_file+0x1c4/0x250 [configfs]
__vfs_write+0x4c/0x90
vfs_write+0x145/0x2c0
ksys_write+0xd7/0x180
__x64_sys_write+0x47/0x50
do_syscall_64+0x6f/0x2f0
entry_SYSCALL_64_after_hwframe+0x49/0xbe
Fixes: ac0d6b926e74 ("block: Reduce the amount of memory required per request queue")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Cc: Keith Busch <kbusch@kernel.org>
Cc: Johannes Thumshirn <jth@kernel.org>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
block/blk-mq.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index d92088dec6c35..062bbf6c55958 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2824,7 +2824,6 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,
memcpy(new_hctxs, hctxs, q->nr_hw_queues *
sizeof(*hctxs));
q->queue_hw_ctx = new_hctxs;
- q->nr_hw_queues = set->nr_hw_queues;
kfree(hctxs);
hctxs = new_hctxs;
}
--
2.20.1
next prev parent reply other threads:[~2020-04-10 4:02 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-10 3:45 [PATCH AUTOSEL 5.6 01/68] cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 02/68] EDAC/mc: Report "unknown memory" on too many DIMM labels found Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 03/68] usb: ucsi: ccg: disable runtime pm during fw flashing Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 04/68] staging: wilc1000: avoid double unlocking of 'wilc->hif_cs' mutex Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 05/68] media: vimc: streamer: fix memory leak in vimc subdevs if kthread_run fails Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 06/68] media: hantro: fix extra MV/MC sync space calculation Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 07/68] media: staging: rkisp1: use consistent bus_info string for media_dev Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 08/68] media: staging: rkisp1: isp: do not set invalid mbus code for pad Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 09/68] media: venus: hfi_parser: Ignore HEVC encoding for V1 Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 10/68] firmware: arm_sdei: fix double-lock on hibernate with shared events Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 11/68] media: arm64: dts: amlogic: add rc-videostrong-kii-pro keymap Sasha Levin
2020-04-10 6:07 ` Sean Young
2020-04-13 17:19 ` Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 12/68] usb: phy: tegra: Include proper GPIO consumer header to fix compile testing Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 13/68] arm64/mm: Hold memory hotplug lock while walking for kernel page table dump Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 14/68] driver core: Reevaluate dev->links.need_for_probe as suppliers are added Sasha Levin
2020-04-10 6:29 ` Greg Kroah-Hartman
2020-04-10 6:39 ` Saravana Kannan
2020-04-10 6:52 ` Greg Kroah-Hartman
2020-04-10 16:25 ` Saravana Kannan
2020-04-11 11:40 ` Greg Kroah-Hartman
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 15/68] sched/vtime: Prevent unstable evaluation of WARN(vtime->state) Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 16/68] iio: imu: st_lsm6dsx: check return value from st_lsm6dsx_sensor_set_enable Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 17/68] null_blk: Fix the null_add_dev() error path Sasha Levin
2020-04-10 3:45 ` Sasha Levin [this message]
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 19/68] null_blk: Handle null_add_dev() failures properly Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 20/68] null_blk: Suppress an UBSAN complaint triggered when setting 'memory_backed' Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 21/68] null_blk: fix spurious IO errors after failed past-wp access Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 22/68] media: imx: imx7_mipi_csis: Power off the source when stopping streaming Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 23/68] media: imx: imx7-media-csi: Fix video field handling Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 24/68] xhci: bail out early if driver can't accress host in resume Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 25/68] ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add() Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 26/68] clocksource/drivers/timer-microchip-pit64b: Fix rate for gck Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 27/68] x86: Don't let pgprot_modify() change the page encryption bit Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 28/68] dma-mapping: Fix dma_pgprot() for unencrypted coherent pages Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 29/68] block: keep bdi->io_pages in sync with max_sectors_kb for stacked devices Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 30/68] debugfs: Check module state before warning in {full/open}_proxy_open() Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 31/68] spi: spi-fsl-dspi: Avoid NULL pointer in dspi_slave_abort for non-DMA mode Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 32/68] irqchip/versatile-fpga: Handle chained IRQs properly Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 33/68] time/sched_clock: Expire timer in hardirq context Sasha Levin
2020-04-10 3:45 ` [PATCH AUTOSEL 5.6 34/68] irqchip/gic-v4.1: Skip absent CPUs while iterating over redistributors Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 35/68] media: allegro: fix type of gop_length in channel_create message Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 36/68] sched: Avoid scale real weight down to zero Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 37/68] sched/fair: Fix condition of avg_load calculation Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 38/68] selftests/x86/ptrace_syscall_32: Fix no-vDSO segfault Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 39/68] PCI/switchtec: Fix init_completion race condition with poll_wait() Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 40/68] block, bfq: move forward the getting of an extra ref in bfq_bfqq_move Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 41/68] io-uring: drop completion when removing file Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 42/68] media: i2c: video-i2c: fix build errors due to 'imply hwmon' Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 43/68] libata: Remove extra scsi_host_put() in ata_scsi_add_hosts() Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 44/68] pstore/platform: fix potential mem leak if pstore_init_fs failed Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 45/68] gfs2: Do log_flush in gfs2_ail_empty_gl even if ail list is empty Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 46/68] gfs2: Don't demote a glock until its revokes are written Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 47/68] cpufreq: imx6q: fix error handling Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 48/68] x86/boot: Use unsigned comparison for addresses Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 49/68] efi/x86: Ignore the memory attributes table on i386 Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 50/68] genirq/irqdomain: Check pointer in irq_domain_alloc_irqs_hierarchy() Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 51/68] blk-mq: Keep set->nr_hw_queues and set->map[].nr_queues in sync Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 52/68] block: Fix use-after-free issue accessing struct io_cq Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 53/68] block, zoned: fix integer overflow with BLKRESETZONE et al Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 54/68] media: mtk-vpu: avoid unaligned access to DTCM buffer Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 55/68] media: i2c: ov5695: Fix power on and off sequences Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 56/68] usb: dwc3: core: add support for disabling SS instances in park mode Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 57/68] irqchip/gic-v4: Provide irq_retrigger to avoid circular locking dependency Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 58/68] md: check arrays is suspended in mddev_detach before call quiesce operations Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 59/68] firmware: fix a double abort case with fw_load_sysfs_fallback Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 60/68] spi: spi-fsl-dspi: Replace interruptible wait queue with a simple completion Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 61/68] locking/lockdep: Avoid recursion in lockdep_count_{for,back}ward_deps() Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 62/68] staging: mt7621-pci: avoid to poweroff the phy for slot one Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 63/68] block, bfq: fix use-after-free in bfq_idle_slice_timer_body Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 64/68] btrfs: hold a ref on the root in btrfs_recover_relocation Sasha Levin
2020-04-10 10:09 ` David Sterba
2020-04-13 17:19 ` Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 65/68] btrfs: qgroup: ensure qgroup_rescan_running is only set when the worker is at least queued Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 66/68] btrfs: remove a BUG_ON() from merge_reloc_roots() Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 67/68] btrfs: restart relocate_tree_blocks properly Sasha Levin
2020-04-10 3:46 ` [PATCH AUTOSEL 5.6 68/68] btrfs: track reloc roots based on their commit root bytenr Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200410034634.7731-18-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=hare@suse.com \
--cc=hch@infradead.org \
--cc=jth@kernel.org \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).