From: Li RongQing <lirongqing@baidu.com>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH] netfilter: only call csum_tcpudp_magic for TCP/UDP packets
Date: Sat, 9 Nov 2019 15:50:17 +0800 [thread overview]
Message-ID: <1573285817-32651-1-git-send-email-lirongqing@baidu.com> (raw)
csum_tcpudp_magic should not be called to compute checksum
for non-TCP/UDP packets, like ICMP with wrong checksum
Signed-off-by: Li RongQing <lirongqing@baidu.com>
---
net/netfilter/utils.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/net/netfilter/utils.c b/net/netfilter/utils.c
index 51b454d8fa9c..72eace52874e 100644
--- a/net/netfilter/utils.c
+++ b/net/netfilter/utils.c
@@ -17,9 +17,12 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
case CHECKSUM_COMPLETE:
if (hook != NF_INET_PRE_ROUTING && hook != NF_INET_LOCAL_IN)
break;
- if ((protocol != IPPROTO_TCP && protocol != IPPROTO_UDP &&
- !csum_fold(skb->csum)) ||
- !csum_tcpudp_magic(iph->saddr, iph->daddr,
+ if (protocol != IPPROTO_TCP && protocol != IPPROTO_UDP) {
+ if (!csum_fold(skb->csum)) {
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+ break;
+ }
+ } else if (!csum_tcpudp_magic(iph->saddr, iph->daddr,
skb->len - dataoff, protocol,
skb->csum)) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
--
2.16.2
next reply other threads:[~2019-11-09 7:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-09 7:50 Li RongQing [this message]
2019-11-12 21:30 ` [PATCH] netfilter: only call csum_tcpudp_magic for TCP/UDP packets Pablo Neira Ayuso
2019-11-13 1:13 ` 答复: " Li,Rongqing
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=1573285817-32651-1-git-send-email-lirongqing@baidu.com \
--to=lirongqing@baidu.com \
--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).