Revision dcd1a59c62dc49da75539213611156d6db50ab5d authored by Ye Bin on 19 October 2022, 03:36:01 UTC, committed by Jens Axboe on 20 October 2022, 13:02:52 UTC
When test as follows: step1: ioctl(sda, BLKTRACESETUP, &arg) step2: ioctl(sda, BLKTRACESTART, NULL) step3: ioctl(sda, BLKTRACETEARDOWN, NULL) step4: ioctl(sda, BLKTRACESETUP, &arg) Got issue as follows: debugfs: File 'dropped' in directory 'sda' already present! debugfs: File 'msg' in directory 'sda' already present! debugfs: File 'trace0' in directory 'sda' already present! And also find syzkaller report issue like "KASAN: use-after-free Read in relay_switch_subbuf" "https://syzkaller.appspot.com/bug?id=13849f0d9b1b818b087341691be6cc3ac6a6bfb7" If remove block trace without stop(BLKTRACESTOP) block trace, '__blk_trace_remove' will just set 'q->blk_trace' with NULL. However, debugfs file isn't removed, so will report file already present when call BLKTRACESETUP. static int __blk_trace_remove(struct request_queue *q) { struct blk_trace *bt; bt = rcu_replace_pointer(q->blk_trace, NULL, lockdep_is_held(&q->debugfs_mutex)); if (!bt) return -EINVAL; if (bt->trace_state != Blktrace_running) blk_trace_cleanup(q, bt); return 0; } If do test as follows: step1: ioctl(sda, BLKTRACESETUP, &arg) step2: ioctl(sda, BLKTRACESTART, NULL) step3: ioctl(sda, BLKTRACETEARDOWN, NULL) step4: remove sda There will remove debugfs directory which will remove recursively all file under directory. >> blk_release_queue >> debugfs_remove_recursive(q->debugfs_dir) So all files which created in 'do_blk_trace_setup' are removed, and 'dentry->d_inode' is NULL. But 'q->blk_trace' is still in 'running_trace_lock', 'trace_note_tsk' will traverse 'running_trace_lock' all nodes. >>trace_note_tsk >> trace_note >> relay_reserve >> relay_switch_subbuf >> d_inode(buf->dentry)->i_size To solve above issues, reference commit '5afedf670caf', call 'blk_trace_cleanup' unconditionally in '__blk_trace_remove' and first stop block trace in 'blk_trace_cleanup'. Signed-off-by: Ye Bin <yebin10@huawei.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20221019033602.752383-3-yebin@huaweicloud.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 60a9bb9
File | Mode | Size |
---|---|---|
.gitignore | -rw-r--r-- | 120 bytes |
Kconfig | -rw-r--r-- | 5.4 KB |
Makefile | -rw-r--r-- | 3.2 KB |
blacklist.c | -rw-r--r-- | 9.4 KB |
blacklist.h | -rw-r--r-- | 135 bytes |
blacklist_hashes.c | -rw-r--r-- | 147 bytes |
check-blacklist-hashes.awk | -rwxr-xr-x | 1.0 KB |
default_x509.genkey | -rw-r--r-- | 407 bytes |
extract-cert.c | -rw-r--r-- | 3.6 KB |
revocation_certificates.S | -rw-r--r-- | 495 bytes |
system_certificates.S | -rw-r--r-- | 1017 bytes |
system_keyring.c | -rw-r--r-- | 9.9 KB |
Computing file changes ...