From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesper Dangaard Brouer Subject: [RFC PATCH 2/2] netfilter: More users of ipv6_find_hdr_cb() Date: Mon, 03 Sep 2012 23:16:47 +0200 Message-ID: <20120903211631.8851.40213.stgit@dragon> References: <20120903211504.8851.6894.stgit@dragon> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: Jesper Dangaard Brouer , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, Pablo Neira Ayuso To: "Patrick McHardy" , Hans Schillstrom , Hans Schillstrom Return-path: Received: from mx1.redhat.com ([209.132.183.28]:18916 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753456Ab2ICVMj (ORCPT ); Mon, 3 Sep 2012 17:12:39 -0400 In-Reply-To: <20120903211504.8851.6894.stgit@dragon> Sender: netfilter-devel-owner@vger.kernel.org List-ID: Functions tproxy_tg6_v1() and socket_mt6_v1 could use the CB cached version of ipv6_find_hdr(). Signed-off-by: Jesper Dangaard Brouer --- Could someone with tproxy or socket experience tell me, if the SKB CB data can survive this far? net/netfilter/xt_TPROXY.c | 2 +- net/netfilter/xt_socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/xt_TPROXY.c b/net/netfilter/xt_TPROXY.c index d7f1953..c73b713 100644 --- a/net/netfilter/xt_TPROXY.c +++ b/net/netfilter/xt_TPROXY.c @@ -285,7 +285,7 @@ tproxy_tg6_v1(struct sk_buff *skb, const struct xt_action_param *par) int thoff = 0; int tproto; - tproto = ipv6_find_hdr(skb, &thoff, -1, NULL, NULL); + tproto = ipv6_find_hdr_cb(skb, &thoff, -1, NULL, NULL); if (tproto < 0) { pr_debug("unable to find transport header in IPv6 packet, dropping\n"); return NF_DROP; diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c index 9ea482d..4feca50 100644 --- a/net/netfilter/xt_socket.c +++ b/net/netfilter/xt_socket.c @@ -266,7 +266,7 @@ socket_mt6_v1(const struct sk_buff *skb, struct xt_action_param *par) int thoff = 0, tproto; const struct xt_socket_mtinfo1 *info = (struct xt_socket_mtinfo1 *) par->matchinfo; - tproto = ipv6_find_hdr(skb, &thoff, -1, NULL, NULL); + tproto = ipv6_find_hdr_cb(skb, &thoff, -1, NULL, NULL); if (tproto < 0) { pr_debug("unable to find transport header in IPv6 packet, dropping\n"); return NF_DROP;