Skip to content

Commit

Permalink
kobject: Don't trigger kobject_uevent(KOBJ_REMOVE) twice.
Browse files Browse the repository at this point in the history
syzbot is hitting use-after-free bug in uinput module [1]. This is because
kobject_uevent(KOBJ_REMOVE) is called again due to commit 0f4dafc
("Kobject: auto-cleanup on final unref") after memory allocation fault
injection made kobject_uevent(KOBJ_REMOVE) from device_del() from
input_unregister_device() fail, while uinput_destroy_device() is expecting
that kobject_uevent(KOBJ_REMOVE) is not called after device_del() from
input_unregister_device() completed.

That commit intended to catch cases where nobody even attempted to send
"remove" uevents. But there is no guarantee that an event will ultimately
be sent. We are at the point of no return as far as the rest of the kernel
is concerned; there are no repeats or do-overs.

Also, it is not clear whether some subsystem depends on that commit.
If no subsystem depends on that commit, it will be better to remove
the state_{add,remove}_uevent_sent logic. But we don't want to risk
a regression (in a patch which will be backported) by trying to remove
that logic. Therefore, as a first step, let's avoid the use-after-free bug
by making sure that kobject_uevent(KOBJ_REMOVE) won't be triggered twice.

[1] https://syzkaller.appspot.com/bug?id=8b17c134fe938bbddd75a45afaa9e68af43a362d

Reported-by: syzbot <[email protected]>
Analyzed-by: Dmitry Torokhov <[email protected]>
Fixes: 0f4dafc ("Kobject: auto-cleanup on final unref")
Cc: Kay Sievers <[email protected]>
Signed-off-by: Tetsuo Handa <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
Tetsuo Handa authored and gregkh committed Apr 1, 2019
1 parent 1be01d4 commit c03a0fd
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions lib/kobject_uevent.c
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,13 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
int i = 0;
int retval = 0;

/*
* Mark "remove" event done regardless of result, for some subsystems
* do not want to re-trigger "remove" event via automatic cleanup.
*/
if (action == KOBJ_REMOVE)
kobj->state_remove_uevent_sent = 1;

pr_debug("kobject: '%s' (%p): %s\n",
kobject_name(kobj), kobj, __func__);

Expand Down Expand Up @@ -567,10 +574,6 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
kobj->state_add_uevent_sent = 1;
break;

case KOBJ_REMOVE:
kobj->state_remove_uevent_sent = 1;
break;

case KOBJ_UNBIND:
zap_modalias_env(env);
break;
Expand Down

0 comments on commit c03a0fd

Please sign in to comment.