Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

loop: remember whether sysfs_create_group() was done

syzbot is hitting WARN() triggered by memory allocation fault
injection [1] because loop module is calling sysfs_remove_group()
when sysfs_create_group() failed.
Fix this by remembering whether sysfs_create_group() succeeded.

[1] https://syzkaller.appspot.com/bug?id=3f86c0edf75c86d2633aeb9dd69eccc70bc7e90b

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reported-by: syzbot <syzbot+9f03168400f56df89dbc6f1751f4458fe739ff29@syzkaller.appspotmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Renamed sysfs_ready -> sysfs_inited.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Tetsuo Handa and committed by
Jens Axboe
d3349b6b 50864670

+7 -5
+6 -5
drivers/block/loop.c
··· 809 809 .attrs= loop_attrs, 810 810 }; 811 811 812 - static int loop_sysfs_init(struct loop_device *lo) 812 + static void loop_sysfs_init(struct loop_device *lo) 813 813 { 814 - return sysfs_create_group(&disk_to_dev(lo->lo_disk)->kobj, 815 - &loop_attribute_group); 814 + lo->sysfs_inited = !sysfs_create_group(&disk_to_dev(lo->lo_disk)->kobj, 815 + &loop_attribute_group); 816 816 } 817 817 818 818 static void loop_sysfs_exit(struct loop_device *lo) 819 819 { 820 - sysfs_remove_group(&disk_to_dev(lo->lo_disk)->kobj, 821 - &loop_attribute_group); 820 + if (lo->sysfs_inited) 821 + sysfs_remove_group(&disk_to_dev(lo->lo_disk)->kobj, 822 + &loop_attribute_group); 822 823 } 823 824 824 825 static void loop_config_discard(struct loop_device *lo)
+1
drivers/block/loop.h
··· 58 58 struct kthread_worker worker; 59 59 struct task_struct *worker_task; 60 60 bool use_dio; 61 + bool sysfs_inited; 61 62 62 63 struct request_queue *lo_queue; 63 64 struct blk_mq_tag_set tag_set;