Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb5e1aa8 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Greg Kroah-Hartman
Browse files

loop: remember whether sysfs_create_group() was done 

commit d3349b6b3c373ac1fbfb040b810fcee5e2adc7e0 upstream.

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: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reported-by: default avatarsyzbot <syzbot+9f03168400f56df89dbc6f1751f4458fe739ff29@syzkaller.appspotmail.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Renamed sysfs_ready -> sysfs_inited.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09b7c336

drivers/block/loop.c

+6 −5
Original line number Diff line number Diff line
@@ -803,14 +803,15 @@ static struct attribute_group loop_attribute_group = { 
	.attrs= loop_attrs,

};



static int loop_sysfs_init(struct loop_device *lo)

static void loop_sysfs_init(struct loop_device *lo)

{

	return sysfs_create_group(&disk_to_dev(lo->lo_disk)->kobj,

	lo->sysfs_inited = !sysfs_create_group(&disk_to_dev(lo->lo_disk)->kobj,

						&loop_attribute_group);

}



static void loop_sysfs_exit(struct loop_device *lo)

{

	if (lo->sysfs_inited)

		sysfs_remove_group(&disk_to_dev(lo->lo_disk)->kobj,

				   &loop_attribute_group);

}

drivers/block/loop.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ struct loop_device { 
	wait_queue_head_t	lo_event;

	/* wait queue for incoming requests */

	wait_queue_head_t	lo_req_wait;

	bool			sysfs_inited;



	struct request_queue	*lo_queue;

	struct gendisk		*lo_disk;