projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2e4f54
)
userns: Convert __dev_set_promiscuity to use kuids in audit logs
author
Eric W. Biederman
<
[email protected]
>
Wed, 23 May 2012 23:01:57 +0000
(17:01 -0600)
committer
Eric W. Biederman
<
[email protected]
>
Wed, 15 Aug 2012 04:42:40 +0000
(21:42 -0700)
Cc: Klaus Heinrich Kiwi <
[email protected]
>
Cc: Eric Paris <
[email protected]
>
Acked-by: David S. Miller <
[email protected]
>
Acked-by: Serge Hallyn <
[email protected]
>
Signed-off-by: "Eric W. Biederman" <
[email protected]
>
net/core/dev.c
patch
|
blob
|
history
diff --git
a/net/core/dev.c
b/net/core/dev.c
index 0cb3fe8d8e7248c1618829673041135a606b36ff..026bb4a376655e645b4939c8bb65534c2473a1f9 100644
(file)
--- 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;
+
k
uid_t uid;
+
k
gid_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));
}