Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d04a48b0 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent b2e4f544

net/core/dev.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -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)

static int __dev_set_promiscuity(struct net_device *dev, int inc)

{

{

	unsigned int old_flags = dev->flags;

	unsigned int old_flags = dev->flags;

	uid_t uid;

	kuid_t uid;

	gid_t gid;

	kgid_t gid;





	ASSERT_RTNL();

	ASSERT_RTNL();
@@ -4525,7 +4525,8 @@ static int __dev_set_promiscuity(struct net_device *dev, int inc) 
				dev->name, (dev->flags & IFF_PROMISC),

				dev->name, (dev->flags & IFF_PROMISC),

				(old_flags & IFF_PROMISC),

				(old_flags & IFF_PROMISC),

				audit_get_loginuid(current),

				audit_get_loginuid(current),

				uid, gid,

				from_kuid(&init_user_ns, uid),

				from_kgid(&init_user_ns, gid),

				audit_get_sessionid(current));

				audit_get_sessionid(current));

		}

		}