selinux: replace obsolete NLMSG_* with type safe nlmsg_*
Subsystems (3)
PATCH 3/6 selinux: replace obsolete NLMSG_* with type safe nlmsg_*
Signed-off-by Hong Zhiguo <[email protected]>
--- security/selinux/hooks.c | 4 ++-- security/selinux/netlink.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-)
security/selinux/hooks.c +2 -2
@@ -60,7 +60,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>
@@ -4475,7 +4475,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; }
security/selinux/netlink.c +1 -2
@@ -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;
Signature · 1 line
1.7.10.4
Quoted 1 line · Hong Zhiguo
Signed-off-by Hong Zhiguo <[email protected]>
Acked-by Thomas Graf <[email protected]>
From: Hong Zhiguo <[email protected]>
Date: Thu, 28 Mar 2013 00:49:35 +0800
Quoted 1 line
Signed-off-by Hong Zhiguo <[email protected]>
Applied.