iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/block
History
Chen Zhongjin 4e68c5da60 block: Fix possible memory leak for rq_wb on add_disk failure 
[ Upstream commit fa81cbafbf5764ad5053512152345fab37a1fe18 ]

kmemleak reported memory leaks in device_add_disk():

kmemleak: 3 new suspected memory leaks

unreferenced object 0xffff88800f420800 (size 512):
  comm "modprobe", pid 4275, jiffies 4295639067 (age 223.512s)
  hex dump (first 32 bytes):
    04 00 00 00 08 00 00 00 01 00 00 00 00 00 00 00  ................
    00 e1 f5 05 00 00 00 00 00 00 00 00 00 00 00 00  ................
  backtrace:
    [<00000000d3662699>] kmalloc_trace+0x26/0x60
    [<00000000edc7aadc>] wbt_init+0x50/0x6f0
    [<0000000069601d16>] wbt_enable_default+0x157/0x1c0
    [<0000000028fc393f>] blk_register_queue+0x2a4/0x420
    [<000000007345a042>] device_add_disk+0x6fd/0xe40
    [<0000000060e6aab0>] nbd_dev_add+0x828/0xbf0 [nbd]
    ...

It is because the memory allocated in wbt_enable_default() is not
released in device_add_disk() error path.
Normally, these memory are freed in:

del_gendisk()
  rq_qos_exit()
    rqos->ops->exit(rqos);
      wbt_exit()

So rq_qos_exit() is called to free the rq_wb memory for wbt_init().
However in the error path of device_add_disk(), only
blk_unregister_queue() is called and make rq_wb memory leaked.

Add rq_qos_exit() to the error path to fix it.

Fixes: 83cbce957446 ("block: add error handling for device_add_disk / add_disk")
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20221029071355.35462-1-chenzhongjin@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2022-11-10 18:15:36 +01:00
..
partitions
block: drop unused includes in <linux/genhd.h>
2022-03-16 14:23:46 +01:00
badblocks.c
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
bdev.c
block: simplify the block device syncing code
2022-04-27 14:38:50 +02:00
bfq-cgroup.c
bfq: Make sure bfqg for which we are queueing requests is online
2022-06-09 10:23:19 +02:00
bfq-iosched.c
bfq: Get rid of __bio_blkcg() usage
2022-06-09 10:23:19 +02:00
bfq-iosched.h
bfq: Get rid of __bio_blkcg() usage
2022-06-09 10:23:19 +02:00
bfq-wf2q.c
block/bfq_wf2q: correct weight to ioprio
2022-04-08 14:23:55 +02:00
bio-integrity.c
block: bio-integrity: Advance seed correctly for larger interval sizes
2022-02-08 18:34:05 +01:00
bio.c
block: ensure iov_iter advances for added pages
2022-08-17 14:24:01 +02:00
blk-cgroup-rwstat.c
blk-cgroup: Fix the recursive blkg rwstat
2021-03-05 11:32:15 -07:00
blk-cgroup-rwstat.h
blk-cgroup: separate out blkg_rwstat under CONFIG_BLK_CGROUP_RWSTAT
2019-11-07 12:28:13 -07:00
blk-cgroup.c
block: fix bio_clone_blkg_association() to associate with proper blkcg_gq
2022-06-09 10:23:32 +02:00
blk-core.c
block: blk_queue_enter() / __bio_queue_enter() must return -EAGAIN for nowait
2022-09-23 14:15:48 +02:00
blk-crypto-fallback.c
block: rename BIO_MAX_PAGES to BIO_MAX_VECS
2021-03-11 07:47:48 -07:00
blk-crypto-internal.h
block: make blk_crypto_rq_bio_prep() able to fail
2020-10-05 10:47:43 -06:00
blk-crypto.c
blk-crypto: fix check for too-large dun_bytes
2021-08-25 06:45:00 -06:00
blk-exec.c
block: return errors from blk_execute_rq()
2021-06-30 15:35:45 -06:00
blk-flush.c
block: Fix fsync always failed if once failed
2022-01-27 11:05:25 +01:00
blk-integrity.c
block: flush the integrity workqueue in blk_integrity_unregister
2021-09-14 20:03:30 -06:00
blk-ioc.c
block: fix default IO priority handling again
2022-08-11 13:07:50 +02:00
blk-iocost.c
block: don't allow the same type rq_qos add more than once
2022-08-17 14:24:24 +02:00
blk-iolatency.c
block: don't allow the same type rq_qos add more than once
2022-08-17 14:24:24 +02:00
blk-ioprio.c
block: Introduce the ioprio rq-qos policy
2021-06-21 15:03:40 -06:00
blk-ioprio.h
block: Introduce the ioprio rq-qos policy
2021-06-21 15:03:40 -06:00
blk-lib.c
block: export blk_next_bio()
2021-06-17 15:51:20 +02:00
blk-map.c
block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern
2022-03-08 19:12:31 +01:00
blk-merge.c
block: don't merge across cgroup boundaries if blkcg is enabled
2022-04-08 14:22:59 +02:00
blk-mq-cpumap.c
blk-mq: remove the calling of local_memory_node()
2020-10-20 07:08:17 -06:00
blk-mq-debugfs-zoned.c
…
blk-mq-debugfs.c
blk-mq: don't create hctx debugfs dir until q->debugfs_dir is created
2022-08-17 14:23:12 +02:00
blk-mq-debugfs.h
blk-mq: no need to check return value of debugfs_create functions
2019-06-13 03:00:30 -06:00
blk-mq-pci.c
block: Fix blk_mq_*_map_queues() kernel-doc headers
2019-05-31 15:12:34 -06:00
blk-mq-rdma.c
block: Fix blk_mq_*_map_queues() kernel-doc headers
2019-05-31 15:12:34 -06:00
blk-mq-sched.c
block: limit request dispatch loop duration
2022-04-08 14:22:59 +02:00
blk-mq-sched.h
blk: Fix lock inversion between ioc lock and bfqd lock
2021-06-24 18:43:55 -06:00
blk-mq-sysfs.c
block: remove blk-mq-sysfs dead code
2021-08-02 13:37:29 -06:00
blk-mq-tag.c
blk-mq: avoid to iterate over stale request
2021-09-12 19:32:43 -06:00
blk-mq-tag.h
blk-mq: Some tag allocation code refactoring
2021-05-24 06:47:22 -06:00
blk-mq-virtio.c
blk-mq: Fix typo in comment
2020-03-17 20:55:21 +01:00
blk-mq.c
blk-mq: fix io hung due to missing commit_rqs
2022-08-31 17:16:50 +02:00
blk-mq.h
blk-mq: cancel blk-mq dispatch work in both blk_cleanup_queue and disk_release()
2021-12-01 09:04:56 +01:00
blk-pm.c
scsi: block: pm: Always set request queue runtime active in blk_post_runtime_resume()
2022-01-27 11:04:15 +01:00
blk-pm.h
block: Remove unused blk_pm_*() function definitions
2021-02-22 06:33:48 -07:00
blk-rq-qos.c
rq-qos: fix missed wake-ups in rq_qos_throttle try two
2021-06-08 15:12:57 -06:00
blk-rq-qos.h
block: don't allow the same type rq_qos add more than once
2022-08-17 14:24:24 +02:00
blk-settings.c
block: Fix partition check for host-aware zoned block devices
2021-10-27 06:58:01 -06:00
blk-stat.c
blk-stat: make q->stats->lock irqsafe
2020-09-01 16:48:46 -06:00
blk-stat.h
…
blk-sysfs.c
block: don't delete queue kobject before its children
2022-04-08 14:23:07 +02:00
blk-throttle.c
blk-throttle: prevent overflow while calculating wait time
2022-10-26 12:35:47 +02:00
blk-timeout.c
block: blk-timeout: delete duplicated word
2020-07-31 16:29:47 -06:00
blk-wbt.c
blk-wbt: fix that 'rwb->wc' is always set to 1 in wbt_init()
2022-10-26 12:35:54 +02:00
blk-wbt.h
blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()
2021-06-21 15:03:41 -06:00
blk-zoned.c
block: Hold invalidate_lock in BLKRESETZONE ioctl
2021-11-18 19:17:15 +01:00
blk.h
block: bump max plugged deferred size from 16 to 32
2021-11-18 19:16:16 +01:00
bounce.c
block: use memcpy_from_bvec in __blk_queue_bounce
2021-08-02 13:37:28 -06:00
bsg-lib.c
scsi: bsg-lib: Fix commands without data transfer in bsg_transport_sg_io_fn()
2021-08-01 13:21:40 -04:00
bsg.c
scsi: bsg: Fix device unregistration
2021-09-14 00:22:15 -04:00
disk-events.c
block: return errors from disk_alloc_events
2021-08-23 12:55:45 -06:00
elevator.c
block/wbt: fix negative inflight counter when remove scsi device
2022-02-23 12:03:15 +01:00
fops.c
block: hold ->invalidate_lock in blkdev_fallocate
2021-09-24 11:06:58 -06:00
genhd.c
block: Fix possible memory leak for rq_wb on add_disk failure
2022-11-10 18:15:36 +01:00
holder.c
block: drop unused includes in <linux/genhd.h>
2022-03-16 14:23:46 +01:00
ioctl.c
block/compat_ioctl: fix range check in BLKGETSIZE
2022-04-27 14:39:02 +02:00
ioprio.c
block: fix default IO priority handling again
2022-08-11 13:07:50 +02:00
Kconfig
SCSI misc on 20210902
2021-09-02 15:09:46 -07:00
Kconfig.iosched
Revert "block/mq-deadline: Add cgroup support"
2021-08-11 13:47:26 -06:00
keyslot-manager.c
- Fix DM integrity's HMAC support to provide enhanced security of
2021-02-22 10:22:54 -08:00
kyber-iosched.c
kyber: avoid q->disk dereferences in trace points
2021-10-15 21:02:57 -06:00
Makefile
block-5.15-2021-09-11
2021-09-11 10:19:51 -07:00
mq-deadline.c
block: fix async_depth sysfs interface for mq-deadline
2022-01-27 11:05:25 +01:00
opal_proto.h
block: sed-opal: Change the check condition for regular session validity
2020-03-12 08:00:10 -06:00
sed-opal.c
block: sed-opal: Change the check condition for regular session validity
2020-03-12 08:00:10 -06:00
t10-pi.c
block: use bvec_kmap_local in t10_pi_type1_{prepare,complete}
2021-08-02 13:37:28 -06:00