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

Commit 77954983 authored by Hong zhi guo's avatar Hong zhi guo Committed by David S. Miller
Browse files

selinux: replace obsolete NLMSG_* with type safe nlmsg_* 



Signed-off-by: default avatarHong Zhiguo <honkiko@gmail.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 94191213

security/selinux/hooks.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;