* [PATCH 3/6] selinux: replace obsolete NLMSG_* with type safe nlmsg_*
@ 2013-03-27 16:49 Hong Zhiguo
2013-03-28 14:33 ` Thomas Graf
2013-03-28 18:28 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Hong Zhiguo @ 2013-03-27 16:49 UTC (permalink / raw)
To: linux-kernel; +Cc: netdev, linux-security-module, davem, tgraf
Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
---
security/selinux/hooks.c | 4 ++--
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 2fa28c8..0a0609f 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -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;
}
diff --git a/security/selinux/netlink.c b/security/selinux/netlink.c
index 14d810e..828fb6a 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;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 3/6] selinux: replace obsolete NLMSG_* with type safe nlmsg_*
2013-03-27 16:49 [PATCH 3/6] selinux: replace obsolete NLMSG_* with type safe nlmsg_* Hong Zhiguo
@ 2013-03-28 14:33 ` Thomas Graf
2013-03-28 18:28 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Graf @ 2013-03-28 14:33 UTC (permalink / raw)
To: Hong Zhiguo; +Cc: linux-kernel, netdev, linux-security-module, davem
On 03/28/13 at 12:49am, Hong Zhiguo wrote:
> Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 3/6] selinux: replace obsolete NLMSG_* with type safe nlmsg_*
2013-03-27 16:49 [PATCH 3/6] selinux: replace obsolete NLMSG_* with type safe nlmsg_* Hong Zhiguo
2013-03-28 14:33 ` Thomas Graf
@ 2013-03-28 18:28 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2013-03-28 18:28 UTC (permalink / raw)
To: honkiko; +Cc: linux-kernel, netdev, linux-security-module, tgraf
From: Hong Zhiguo <honkiko@gmail.com>
Date: Thu, 28 Mar 2013 00:49:35 +0800
> Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-28 18:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-27 16:49 [PATCH 3/6] selinux: replace obsolete NLMSG_* with type safe nlmsg_* Hong Zhiguo
2013-03-28 14:33 ` Thomas Graf
2013-03-28 18:28 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).