From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 10/11] netfilter: nft_flow_offload: IPCB is only valid for ipv4 family
Date: Thu, 23 May 2019 23:35:46 +0200 [thread overview]
Message-ID: <20190523213547.15523-11-pablo@netfilter.org> (raw)
In-Reply-To: <20190523213547.15523-1-pablo@netfilter.org>
From: Florian Westphal <fw@strlen.de>
Guard this with a check vs. ipv4, IPCB isn't valid in ipv6 case.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nft_flow_offload.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
index c97c03c3939a..d70742e95e14 100644
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -48,15 +48,20 @@ static int nft_flow_route(const struct nft_pktinfo *pkt,
return 0;
}
-static bool nft_flow_offload_skip(struct sk_buff *skb)
+static bool nft_flow_offload_skip(struct sk_buff *skb, int family)
{
- struct ip_options *opt = &(IPCB(skb)->opt);
-
- if (unlikely(opt->optlen))
- return true;
if (skb_sec_path(skb))
return true;
+ if (family == NFPROTO_IPV4) {
+ const struct ip_options *opt;
+
+ opt = &(IPCB(skb)->opt);
+
+ if (unlikely(opt->optlen))
+ return true;
+ }
+
return false;
}
@@ -74,7 +79,7 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,
struct nf_conn *ct;
int ret;
- if (nft_flow_offload_skip(pkt->skb))
+ if (nft_flow_offload_skip(pkt->skb, nft_pf(pkt)))
goto out;
ct = nf_ct_get(pkt->skb, &ctinfo);
--
2.11.0
next prev parent reply other threads:[~2019-05-23 21:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 21:35 [PATCH 00/11] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 01/11] netfilter: nf_tables: fix oops during rule dump Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 02/11] netfilter: nf_queue: fix reinject verdict handling Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 03/11] netfilter: nft_fib: Fix existence check support Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 04/11] ipvs: Fix use-after-free in ip_vs_in Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 05/11] selftests: netfilter: missing error check when setting up veth interface Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 06/11] netfilter: nat: fix udp checksum corruption Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 07/11] netfilter: nf_flow_table: ignore DF bit setting Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 08/11] netfilter: nft_flow_offload: set liberal tracking mode for tcp Pablo Neira Ayuso
2019-05-23 21:35 ` [PATCH 09/11] netfilter: nft_flow_offload: don't offload when sequence numbers need adjustment Pablo Neira Ayuso
2019-05-23 21:35 ` Pablo Neira Ayuso [this message]
2019-05-23 21:35 ` [PATCH 11/11] selftests: netfilter: add flowtable test script Pablo Neira Ayuso
2019-05-23 21:45 ` [PATCH 00/11] Netfilter/IPVS fixes for net David Miller
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=20190523213547.15523-11-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/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).