From 03a5f173fa3b430fb504dee170ffbc0020ada530 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Wed, 23 May 2012 17:01:57 -0600 Subject: [PATCH] --- yaml --- r: 327220 b: refs/heads/master c: d04a48b06d63b6d6e9289ca8a5e6e84ebfe39bfd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 827569e67a77..8d5ff7afc9cf 100644 --- 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 index 0cb3fe8d8e72..026bb4a37665 100644 --- 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)); }