From patchwork Wed Mar 27 16:49:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hong zhi guo X-Patchwork-Id: 231753 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2CB942C007E for ; Thu, 28 Mar 2013 03:49:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751969Ab3C0QtU (ORCPT ); Wed, 27 Mar 2013 12:49:20 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:43393 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750905Ab3C0QtS (ORCPT ); Wed, 27 Mar 2013 12:49:18 -0400 Received: by mail-pd0-f173.google.com with SMTP id v10so3638499pde.32 for ; Wed, 27 Mar 2013 09:49:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=d46DF88+QKm8n/f6Nad6alBa+GCOsP2vyQHMkoKPNYU=; b=uJTOkV+SoJjziGIsvYWVhLpZY9xjubO12Yr9DpHOd9Deenm+cVVXt6sZm4ihVOM5HK 3DgR1zYTC7h1z807UiPoRml+f3RyG9ZERnJbZyiLDIKErrjRGw1JemFzOfO/cPmnRAqf PEFrd8EzCjGb8czOVIEYkJAH7Itw5Y965/tJQ3T6z/3Oh7O5c8mCbQ/0BK/28VWq4d9x s2EuYjOcHmPNpS8jmXp/VmhqI7ldzijHutNhUJCpbFgRURQSoTbfIOldBdJuBOB4NXGE uSSLD/Ik2xQvHtjDvhnAWW9+s2sYRvwPfFb8XeCWy+svhcwyGd6zof/mcrTMCaN5aEUn DV7A== X-Received: by 10.66.183.33 with SMTP id ej1mr30384104pac.8.1364402958218; Wed, 27 Mar 2013 09:49:18 -0700 (PDT) Received: from suse.kiko.com ([111.161.70.12]) by mx.google.com with ESMTPS id wm3sm22099367pbc.4.2013.03.27.09.49.15 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 27 Mar 2013 09:49:17 -0700 (PDT) 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 2/6] audit: replace obsolete NLMSG_* with type safe nlmsg_* Date: Thu, 28 Mar 2013 00:49:06 +0800 Message-Id: <1364402946-32715-1-git-send-email-honkiko@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Hong Zhiguo Acked-by: Thomas Graf --- 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 #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);