Merge tag 'audit-pr-20180605' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoor...

[linux-2.6-microblaze.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 983b277..9c14923 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6731,15 +6731,15 @@ static int __dev_set_promiscuity(struct net_device *dev, int inc, bool notify)
                        dev->flags & IFF_PROMISC ? "entered" : "left");
                if (audit_enabled) {
                        current_uid_gid(&uid, &gid);
-                       audit_log(current->audit_context, GFP_ATOMIC,
-                               AUDIT_ANOM_PROMISCUOUS,
-                               "dev=%s prom=%d old_prom=%d auid=%u uid=%u gid=%u ses=%u",
-                               dev->name, (dev->flags & IFF_PROMISC),
-                               (old_flags & IFF_PROMISC),
-                               from_kuid(&init_user_ns, audit_get_loginuid(current)),
-                               from_kuid(&init_user_ns, uid),
-                               from_kgid(&init_user_ns, gid),
-                               audit_get_sessionid(current));
+                       audit_log(audit_context(), GFP_ATOMIC,
+                                 AUDIT_ANOM_PROMISCUOUS,
+                                 "dev=%s prom=%d old_prom=%d auid=%u uid=%u gid=%u ses=%u",
+                                 dev->name, (dev->flags & IFF_PROMISC),
+                                 (old_flags & IFF_PROMISC),
+                                 from_kuid(&init_user_ns, audit_get_loginuid(current)),
+                                 from_kuid(&init_user_ns, uid),
+                                 from_kgid(&init_user_ns, gid),
+                                 audit_get_sessionid(current));
                }
 
                dev_change_rx_flags(dev, IFF_PROMISC);