diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-23 17:01:57 -0600 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-08-14 21:42:40 -0700 |
| commit | d04a48b06d63b6d6e9289ca8a5e6e84ebfe39bfd (patch) | |
| tree | 0f355b4ec7bb9648e5e6f172fbd24f963599607e /net | |
| parent | b2e4f544fddc812d6fe802bab5f600b4b783f45d (diff) | |
| download | linux-3.10-d04a48b06d63b6d6e9289ca8a5e6e84ebfe39bfd.tar.gz linux-3.10-d04a48b06d63b6d6e9289ca8a5e6e84ebfe39bfd.tar.bz2 linux-3.10-d04a48b06d63b6d6e9289ca8a5e6e84ebfe39bfd.zip | |
userns: Convert __dev_set_promiscuity to use kuids in audit logs
Cc: Klaus Heinrich Kiwi <klausk@br.ibm.com>
Cc: Eric Paris <eparis@redhat.com>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 0cb3fe8d8e7..026bb4a3766 100644 --- a/net/core/dev.c +++ b/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)); } |