From: pablo@netfilter.org
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, Julian Anastasov <ja@ssi.bg>,
Pablo Neira Ayuso <pablo@netfilter.org>
Subject: [PATCH 5/7] netfilter: nf_nat: fix crash in nf_nat_csum
Date: Mon, 6 Jun 2011 02:11:38 +0200 [thread overview]
Message-ID: <1307319100-21827-6-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1307319100-21827-1-git-send-email-pablo@netfilter.org>
From: Julian Anastasov <ja@ssi.bg>
Fix crash in nf_nat_csum when mangling packets
in OUTPUT hook where skb->dev is not defined, it is set
later before POSTROUTING. Problem happens for CHECKSUM_NONE.
We can check device from rt but using CHECKSUM_PARTIAL
should be safe (skb_checksum_help).
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/ipv4/netfilter/nf_nat_helper.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/ipv4/netfilter/nf_nat_helper.c b/net/ipv4/netfilter/nf_nat_helper.c
index 99cfa28..ebc5f88 100644
--- a/net/ipv4/netfilter/nf_nat_helper.c
+++ b/net/ipv4/netfilter/nf_nat_helper.c
@@ -160,7 +160,7 @@ static void nf_nat_csum(struct sk_buff *skb, const struct iphdr *iph, void *data
if (skb->ip_summed != CHECKSUM_PARTIAL) {
if (!(rt->rt_flags & RTCF_LOCAL) &&
- skb->dev->features & NETIF_F_V4_CSUM) {
+ (!skb->dev || skb->dev->features & NETIF_F_V4_CSUM)) {
skb->ip_summed = CHECKSUM_PARTIAL;
skb->csum_start = skb_headroom(skb) +
skb_network_offset(skb) +
--
1.7.2.5
next prev parent reply other threads:[~2011-06-06 0:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-06 0:11 [PATCH 0/7] netfilter fixes for 3.0.0-rc1 (try 2) pablo
2011-06-06 0:11 ` [PATCH 1/7] netfilter: add more values to enum ip_conntrack_info pablo
2011-06-06 0:11 ` [PATCH 2/7] ipvs: restore support for iptables SNAT pablo
2011-06-06 0:11 ` [PATCH 3/7] netfilter: ipset: Fix return code for destroy when sets are in use pablo
2011-06-06 0:11 ` [PATCH 4/7] netfilter: ipset: Use the stored first cidr value instead of '1' pablo
2011-06-06 0:11 ` pablo [this message]
2011-06-06 0:11 ` [PATCH 6/7] netfilter: nf_conntrack: fix ct refcount leak in l4proto->error() pablo
2011-06-06 2:10 ` "Oleg A. Arkhangelsky"
2011-06-06 23:17 ` Pablo Neira Ayuso
2011-06-06 0:11 ` [PATCH 7/7] netfilter: use unsigned variables for packet lengths in ip[6]_queue pablo
2011-06-06 0:15 ` [PATCH 0/7] netfilter fixes for 3.0.0-rc1 (try 2) 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=1307319100-21827-6-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=ja@ssi.bg \
--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).