Eric Biggers 5bb4005fb6 blk-crypto: make blk_crypto_evict_key() more robust ... commit 5c7cb94452 upstream. If blk_crypto_evict_key() sees that the key is still in-use (due to a bug) or that ->keyslot_evict failed, it currently just returns while leaving the key linked into the keyslot management structures. However, blk_crypto_evict_key() is only called in contexts such as inode eviction where failure is not an option. So actually the caller proceeds with freeing the blk_crypto_key regardless of the return value of blk_crypto_evict_key(). These two assumptions don't match, and the result is that there can be a use-after-free in blk_crypto_reprogram_all_keys() after one of these errors occurs. (Note, these errors *shouldn't* happen; we're just talking about what happens if they do anyway.) Fix this by making blk_crypto_evict_key() unlink the key from the keyslot management structures even on failure. Also improve some comments. Fixes: 1b26283970 ("block: Keyslot Manager for Inline Encryption") Cc: stable@vger.kernel.org Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20230315183907.53675-2-ebiggers@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2023-05-11 23:00:16 +09:00
..
partitions	block: drop unused includes in <linux/genhd.h>	2022-03-16 14:23:46 +01: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
Makefile	block: move CONFIG_BLOCK guard to top Makefile	2022-12-14 11:37:30 +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	block, bfq: fix uaf for bfqq in bic_set_bfqq()	2023-02-09 11:26:36 +01:00
bfq-iosched.c	block, bfq: fix uaf for bfqq in bic_set_bfqq()	2023-02-09 11:26:36 +01: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: Copy flags when bio_integrity_payload is cloned	2023-03-10 09:39: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	blk-cgroup: fix missing pd_online_fn() while activating policy	2023-02-06 07:59:00 +01:00
blk-core.c	blk-mq: release crypto keyslot before reporting I/O complete	2023-05-11 23:00:16 +09: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	blk-mq: release crypto keyslot before reporting I/O complete	2023-05-11 23:00:16 +09:00
blk-crypto.c	blk-crypto: make blk_crypto_evict_key() more robust	2023-05-11 23:00:16 +09: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	blk-iocost: fix divide by 0 error in calc_lcoefs()	2023-03-10 09:39:46 +01: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	blk-mq: release crypto keyslot before reporting I/O complete	2023-05-11 23:00:16 +09: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	block: Cleanup license notice	2019-01-17 21:21:40 -07:00
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	blk-mq: correct stale comment of .get_budget	2023-03-10 09:39:04 +01: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	blk-mq: fix possible memleak when register 'hctx' failed	2022-12-31 13:14:43 +01: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: release crypto keyslot before reporting I/O complete	2023-05-11 23:00:16 +09: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	block: deactivate blk_stat timer in wbt_disable_default()	2018-12-12 06:47:51 -07:00
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: don't allow multiple bios for IOCB_NOWAIT issue	2023-03-10 09:39:55 +01:00
genhd.c	block: clear ->slave_dir when dropping the main slave_dir reference	2022-12-31 13:14:10 +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
keyslot-manager.c	blk-crypto: make blk_crypto_evict_key() more robust	2023-05-11 23:00:16 +09:00
kyber-iosched.c	kyber: avoid q->disk dereferences in trace points	2021-10-15 21:02:57 -06:00
mq-deadline.c	block: mq-deadline: Rename deadline_is_seq_writes()	2023-01-24 07:22:49 +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: kmalloc the cmd/resp buffers	2022-11-26 09:24:35 +01:00
t10-pi.c	block: use bvec_kmap_local in t10_pi_type1_{prepare,complete}	2021-08-02 13:37:28 -06:00