From: gfree.wind@foxmail.com
To: pablo@netfilter.org, netfilter-devel@vger.kernel.org
Cc: Gao Feng <fgao@ikuai8.com>
Subject: [PATCH nf 1/1] netfilter: seqadj: Fix possible non-linear data access for TCP header
Date: Mon, 10 Apr 2017 18:36:03 +0800 [thread overview]
Message-ID: <1491820563-98023-1-git-send-email-gfree.wind@foxmail.com> (raw)
From: Gao Feng <fgao@ikuai8.com>
The current call path of nf_ct_tcp_seqadj_set is the following.
nfqnl_recv_verdict->ctnetlink_glue_hook->ctnetlink_glue_seqadj
->nf_ct_tcp_seqadj_set.
It couldn't make sure the TCP header is in the linear data part.
So use the skb_header_pointer instead of the current codes.
BTW, the nf_ct_tcp_seqadj_set is one external function of netfilter
which works in the network layer, it should not assume the transport
header is in the linear data.
Signed-off-by: Gao Feng <fgao@ikuai8.com>
---
net/netfilter/nf_conntrack_seqadj.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/nf_conntrack_seqadj.c b/net/netfilter/nf_conntrack_seqadj.c
index ef7063e..80394ab 100644
--- a/net/netfilter/nf_conntrack_seqadj.c
+++ b/net/netfilter/nf_conntrack_seqadj.c
@@ -61,11 +61,14 @@ void nf_ct_tcp_seqadj_set(struct sk_buff *skb,
s32 off)
{
const struct tcphdr *th;
+ struct tcphdr tcph;
if (nf_ct_protonum(ct) != IPPROTO_TCP)
return;
- th = (struct tcphdr *)(skb_network_header(skb) + ip_hdrlen(skb));
+ th = skb_header_pointer(skb, ip_hdrlen(skb), sizeof(tcph), &tcph);
+ if (!th)
+ return;
nf_ct_seqadj_set(ct, ctinfo, th->seq, off);
}
EXPORT_SYMBOL_GPL(nf_ct_tcp_seqadj_set);
--
1.9.1
next reply other threads:[~2017-04-10 10:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-10 10:36 gfree.wind [this message]
2017-04-10 12:06 ` [PATCH nf 1/1] netfilter: seqadj: Fix possible non-linear data access for TCP header Pablo Neira Ayuso
2017-04-11 0:59 ` 高峰
2017-04-11 2:44 ` Gao Feng
2017-04-11 2:47 ` 高峰
2017-04-11 2:53 ` Gao Feng
2017-04-13 21:37 ` Pablo Neira Ayuso
2017-04-13 21:42 ` Pablo Neira Ayuso
2017-04-13 21:44 ` Pablo Neira Ayuso
2017-04-13 22:17 ` Gao Feng
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=1491820563-98023-1-git-send-email-gfree.wind@foxmail.com \
--to=gfree.wind@foxmail.com \
--cc=fgao@ikuai8.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.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).