---

yaml --- r: 327220 b: refs/heads/master c: d04a48b h: refs/heads/master v: v3
git-mirror · Aug 15, 2012 · 03a5f17 · 03a5f17
1 parent 16e7841
commit 03a5f17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2e4f544fddc812d6fe802bab5f600b4b783f45d
+refs/heads/master: d04a48b06d63b6d6e9289ca8a5e6e84ebfe39bfd
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -4492,8 +4492,8 @@ static void dev_change_rx_flags(struct net_device *dev, int flags)
 static int __dev_set_promiscuity(struct net_device *dev, int inc)
 {
 	unsigned int old_flags = dev->flags;
-	uid_t uid;
-	gid_t gid;
+	kuid_t uid;
+	kgid_t gid;
 
 	ASSERT_RTNL();
 
@@ -4525,7 +4525,8 @@ static int __dev_set_promiscuity(struct net_device *dev, int inc)
 				dev->name, (dev->flags & IFF_PROMISC),
 				(old_flags & IFF_PROMISC),
 				audit_get_loginuid(current),
-				uid, gid,
+				from_kuid(&init_user_ns, uid),
+				from_kgid(&init_user_ns, gid),
 				audit_get_sessionid(current));
 		}