Merge tag 'driver-core-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / lib / kobject_uevent.c

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index fb9a2f0..03b427e 100644 (file)
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -30,7 +30,7 @@
 #include <net/net_namespace.h>
 
 
-u64 uevent_seqnum;
+atomic64_t uevent_seqnum;
 #ifdef CONFIG_UEVENT_HELPER
 char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
 #endif
@@ -42,10 +42,9 @@ struct uevent_sock {
 
 #ifdef CONFIG_NET
 static LIST_HEAD(uevent_sock_list);
-#endif
-
-/* This lock protects uevent_seqnum and uevent_sock_list */
+/* This lock protects uevent_sock_list */
 static DEFINE_MUTEX(uevent_sock_mutex);
+#endif
 
 /* the strings here must match the enum in include/linux/kobject.h */
 static const char *kobject_actions[] = {
@@ -315,6 +314,7 @@ static int uevent_net_broadcast_untagged(struct kobj_uevent_env *env,
        int retval = 0;
 
        /* send netlink message */
+       mutex_lock(&uevent_sock_mutex);
        list_for_each_entry(ue_sk, &uevent_sock_list, list) {
                struct sock *uevent_sock = ue_sk->sk;
 
@@ -334,6 +334,7 @@ static int uevent_net_broadcast_untagged(struct kobj_uevent_env *env,
                if (retval == -ENOBUFS || retval == -ESRCH)
                        retval = 0;
        }
+       mutex_unlock(&uevent_sock_mutex);
        consume_skb(skb);
 
        return retval;
@@ -583,16 +584,14 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                break;
        }
 
-       mutex_lock(&uevent_sock_mutex);
        /* we will send an event, so request a new sequence number */
-       retval = add_uevent_var(env, "SEQNUM=%llu", ++uevent_seqnum);
-       if (retval) {
-               mutex_unlock(&uevent_sock_mutex);
+       retval = add_uevent_var(env, "SEQNUM=%llu",
+                               atomic64_inc_return(&uevent_seqnum));
+       if (retval)
                goto exit;
-       }
+
        retval = kobject_uevent_net_broadcast(kobj, env, action_string,
                                              devpath);
-       mutex_unlock(&uevent_sock_mutex);
 
 #ifdef CONFIG_UEVENT_HELPER
        /* call uevent_helper, usually only enabled during early boot */
@@ -688,7 +687,8 @@ static int uevent_net_broadcast(struct sock *usk, struct sk_buff *skb,
        int ret;
 
        /* bump and prepare sequence number */
-       ret = snprintf(buf, sizeof(buf), "SEQNUM=%llu", ++uevent_seqnum);
+       ret = snprintf(buf, sizeof(buf), "SEQNUM=%llu",
+                      atomic64_inc_return(&uevent_seqnum));
        if (ret < 0 || (size_t)ret >= sizeof(buf))
                return -ENOMEM;
        ret++;
@@ -742,9 +742,7 @@ static int uevent_net_rcv_skb(struct sk_buff *skb, struct nlmsghdr *nlh,
                return -EPERM;
        }
 
-       mutex_lock(&uevent_sock_mutex);
        ret = uevent_net_broadcast(net->uevent_sock->sk, skb, extack);
-       mutex_unlock(&uevent_sock_mutex);
 
        return ret;
 }