]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
netlink: fix compilation after memory mapped patches
authorNicolas Dichtel <nicolas.dichtel@6wind.com>
Wed, 24 Apr 2013 08:36:23 +0000 (10:36 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Apr 2013 18:26:55 +0000 (14:26 -0400)
commit1bf9310a1336c26873dc3eb5fa188d4263897929
tree3e9e3815e8a7becbe26ce0cd9e46440d2ddceef7
parent3dec2246c2ff11beb24ca1950f074b2bcbc85953
netlink: fix compilation after memory mapped patches

Depending of the kernel configuration (CONFIG_UIDGID_STRICT_TYPE_CHECKS), we can
get the following errors:

net/netlink/af_netlink.c: In function ‘netlink_queue_mmaped_skb’:
net/netlink/af_netlink.c:663:14: error: incompatible types when assigning to type ‘__u32’ from type ‘kuid_t’
net/netlink/af_netlink.c:664:14: error: incompatible types when assigning to type ‘__u32’ from type ‘kgid_t’
net/netlink/af_netlink.c: In function ‘netlink_ring_set_copied’:
net/netlink/af_netlink.c:693:14: error: incompatible types when assigning to type ‘__u32’ from type ‘kuid_t’
net/netlink/af_netlink.c:694:14: error: incompatible types when assigning to type ‘__u32’ from type ‘kgid_t’

We must use the helpers to get the uid and gid, and also take care of user_ns.

Fix suggested by Eric W. Biederman <ebiederm@xmission.com>.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netlink/af_netlink.c