Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753027Ab3C0Qtt (ORCPT ); Wed, 27 Mar 2013 12:49:49 -0400 Received: from mail-pb0-f54.google.com ([209.85.160.54]:45170 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752020Ab3C0Qtr (ORCPT ); Wed, 27 Mar 2013 12:49:47 -0400 From: Hong Zhiguo To: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org, linux-security-module@vger.kernel.org, davem@davemloft.net, tgraf@suug.ch Subject: [PATCH 3/6] selinux: replace obsolete NLMSG_* with type safe nlmsg_* Date: Thu, 28 Mar 2013 00:49:35 +0800 Message-Id: <1364402975-32747-1-git-send-email-honkiko@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1734 Lines: 57 Signed-off-by: Hong Zhiguo --- 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 #include #include /* for network interface checks */ -#include +#include #include #include #include @@ -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 #include #include -#include #include #include #include @@ -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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/