netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Richard Guy Briggs <rgb@redhat.com>
Cc: Netfilter Developer Mailing List
	<netfilter-devel@vger.kernel.org>,
	linux-audit@redhat.com, Florian Westphal <fw@strlen.de>,
	Thomas Woerner <twoerner@redhat.com>,
	Thomas Graf <tgraf@infradead.org>, Eric Paris <eparis@redhat.com>,
	Paul Moore <pmoore@redhat.com>, Steve Grubb <sgrubb@redhat.com>
Subject: Re: [PATCH V4 1/2] netfilter: xt_AUDIT: use consistent ipv4 network offset
Date: Wed, 22 Mar 2017 12:11:51 +0100	[thread overview]
Message-ID: <20170322111151.GA2766@salvia> (raw)
In-Reply-To: <d2ef98ddd4884276879107d4cd4521330e709578.1490165887.git.rgb@redhat.com>

On Wed, Mar 22, 2017 at 03:05:36AM -0400, Richard Guy Briggs wrote:
> Even though the skb->data pointer has been moved from the link layer
> header to the network layer header, use the same method to calculate the
> offset in ipv4 and ipv6 routines.
> 
> Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
> ---
>  net/netfilter/xt_AUDIT.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/netfilter/xt_AUDIT.c b/net/netfilter/xt_AUDIT.c
> index 4973cbd..cdb7cee 100644
> --- a/net/netfilter/xt_AUDIT.c
> +++ b/net/netfilter/xt_AUDIT.c
> @@ -76,7 +76,7 @@ static void audit_ip4(struct audit_buffer *ab, struct sk_buff *skb)
>  	struct iphdr _iph;
>  	const struct iphdr *ih;
>  
> -	ih = skb_header_pointer(skb, 0, sizeof(_iph), &_iph);
> +	ih = skb_header_pointer(skb, skb_network_offset(skb), sizeof(_iph), &_iph);

This update is completely pointless.

If you want I can place it in nf-next, your call.

  parent reply	other threads:[~2017-03-22 11:12 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-22  7:05 [PATCH V4 1/2] netfilter: xt_AUDIT: use consistent ipv4 network offset Richard Guy Briggs
2017-03-22  7:05 ` [PATCH V4 2/2] audit: normalize NETFILTER_PKT Richard Guy Briggs
2017-03-23 18:44   ` Paul Moore
2017-03-22 11:11 ` Pablo Neira Ayuso [this message]
2017-03-22 11:43   ` [PATCH V4 1/2] netfilter: xt_AUDIT: use consistent ipv4 network offset Richard Guy Briggs
2017-03-22 12:56     ` Pablo Neira Ayuso
2017-03-23 18:44     ` Paul Moore

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170322111151.GA2766@salvia \
    --to=pablo@netfilter.org \
    --cc=eparis@redhat.com \
    --cc=fw@strlen.de \
    --cc=linux-audit@redhat.com \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pmoore@redhat.com \
    --cc=rgb@redhat.com \
    --cc=sgrubb@redhat.com \
    --cc=tgraf@infradead.org \
    --cc=twoerner@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).