Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755937Ab3DLNfl (ORCPT ); Fri, 12 Apr 2013 09:35:41 -0400 Received: from mail-la0-f51.google.com ([209.85.215.51]:60452 "EHLO mail-la0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755440Ab3DLNfj (ORCPT ); Fri, 12 Apr 2013 09:35:39 -0400 MIME-Version: 1.0 In-Reply-To: <1364402946-32715-1-git-send-email-honkiko@gmail.com> References: <1364402946-32715-1-git-send-email-honkiko@gmail.com> Date: Fri, 12 Apr 2013 09:35:37 -0400 Message-ID: Subject: Re: [PATCH 2/6] audit: replace obsolete NLMSG_* with type safe nlmsg_* From: Eric Paris To: Hong Zhiguo Cc: Linux Kernel Mailing List , Linux Netdev List , LSM List , David Miller , Thomas Graf Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2798 Lines: 75 On Wed, Mar 27, 2013 at 12:49 PM, Hong Zhiguo wrote: > Signed-off-by: Hong Zhiguo > --- > kernel/audit.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/kernel/audit.c b/kernel/audit.c > index d596e53..4dbb047 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -58,7 +58,7 @@ > #ifdef CONFIG_SECURITY > #include > #endif > -#include > +#include This is a duplicate include. We already included net/netlink.h a couple of lines above. We use netlink_unicast, which comes from linux/netlink.h. I recognize that it comes in from net/netlink.h, but I thought it good practice to pull it in ourselves. Should I send a separate patch to revert back to linux/netlink.h or a patch to just remove the include altogether? -Eric > #include > #include > #include > @@ -910,7 +910,7 @@ static void audit_receive_skb(struct sk_buff *skb) > { > struct nlmsghdr *nlh; > /* > - * len MUST be signed for NLMSG_NEXT to be able to dec it below 0 > + * len MUST be signed for nlmsg_next to be able to dec it below 0 > * if the nlmsg_len was not aligned > */ > int len; > @@ -919,13 +919,13 @@ static void audit_receive_skb(struct sk_buff *skb) > nlh = nlmsg_hdr(skb); > len = skb->len; > > - while (NLMSG_OK(nlh, len)) { > + while (nlmsg_ok(nlh, len)) { > err = audit_receive_msg(skb, nlh); > /* if err or if this message says it wants a response */ > if (err || (nlh->nlmsg_flags & NLM_F_ACK)) > netlink_ack(skb, nlh, err); > > - nlh = NLMSG_NEXT(nlh, len); > + nlh = nlmsg_next(nlh, len); > } > } > > @@ -1483,7 +1483,7 @@ void audit_log_end(struct audit_buffer *ab) > audit_log_lost("rate limit exceeded"); > } else { > struct nlmsghdr *nlh = nlmsg_hdr(ab->skb); > - nlh->nlmsg_len = ab->skb->len - NLMSG_SPACE(0); > + nlh->nlmsg_len = ab->skb->len - NLMSG_HDRLEN; > > if (audit_pid) { > skb_queue_tail(&audit_skb_queue, ab->skb); > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-security-module" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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/