lib/strscpy: Shut up KASAN false-positives in strscpy()

[mirror_ubuntu-bionic-kernel.git] / lib / kobject_uevent.c

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 2615074d3de5c63e63da31995adc4a1f07f7e9fd..37fe18c06f7f8a0898b762a6040b1c7463a3e9c5 100644 (file)
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -394,6 +394,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__);
 
@@ -495,10 +502,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;