diff options
| author | Hong zhi guo <honkiko@gmail.com> | 2013-03-27 06:49:35 +0000 |
|---|---|---|
| committer | Julian Veit <claymore1298@gmail.com> | 2020-08-05 14:12:59 +0200 |
| commit | 56b65d41a8f4b1010f369b393f814ed7b7d8c9b8 (patch) | |
| tree | 659acedb4457cd049ca3ff696f03ae5bef79bac9 | |
| parent | 03e72c3ea7577b1c7f0c4250a40cfdb8adeb2763 (diff) | |
selinux: replace obsolete NLMSG_* with type safe nlmsg_*q10.0
Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>
Change-Id: I3ef7572b0fa0199710a1e9137c88c4b03faaea0b
| -rw-r--r-- | security/selinux/hooks.c | 4 | ||||
| -rw-r--r-- | security/selinux/netlink.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 11069a8e173..7318b57df7f 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -61,7 +61,7 @@ #include <linux/bitops.h> #include <linux/interrupt.h> #include <linux/netdevice.h> /* for network interface checks */ -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/tcp.h> #include <linux/udp.h> #include <linux/dccp.h> @@ -4681,7 +4681,7 @@ static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb) struct nlmsghdr *nlh; struct sk_security_struct *sksec = sk->sk_security; - if (skb->len < NLMSG_SPACE(0)) { + if (skb->len < NLMSG_HDRLEN) { err = -EINVAL; goto out; } diff --git a/security/selinux/netlink.c b/security/selinux/netlink.c index 8a23a35b9c5..4c4da20232d 100644 --- a/security/selinux/netlink.c +++ b/security/selinux/netlink.c @@ -16,7 +16,6 @@ #include <linux/kernel.h> #include <linux/export.h> #include <linux/skbuff.h> -#include <linux/netlink.h> #include <linux/selinux_netlink.h> #include <net/net_namespace.h> #include <net/netlink.h> @@ -77,7 +76,7 @@ static void selnl_notify(int msgtype, void *data) len = selnl_msglen(msgtype); - skb = alloc_skb(NLMSG_SPACE(len), GFP_USER); + skb = nlmsg_new(len, GFP_USER); if (!skb) goto oom; |