Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+4 -3
+4 -3
net/core/dev.c
··· 4492 4492 static int __dev_set_promiscuity(struct net_device *dev, int inc) 4493 4493 { 4494 4494 unsigned int old_flags = dev->flags; 4495 - uid_t uid; 4496 - gid_t gid; 4495 + kuid_t uid; 4496 + kgid_t gid; 4497 4497 4498 4498 ASSERT_RTNL(); 4499 4499 ··· 4525 4525 dev->name, (dev->flags & IFF_PROMISC), 4526 4526 (old_flags & IFF_PROMISC), 4527 4527 audit_get_loginuid(current), 4528 - uid, gid, 4528 + from_kuid(&init_user_ns, uid), 4529 + from_kgid(&init_user_ns, gid), 4529 4530 audit_get_sessionid(current)); 4530 4531 } 4531 4532