netfilter: nf_nat: fix crash in nf_nat_csum
authorJulian Anastasov <ja@ssi.bg>
Sun, 29 May 2011 20:42:29 +0000 (23:42 +0300)
committerPablo Neira Ayuso <pablo@netfilter.org>
Sun, 5 Jun 2011 23:36:46 +0000 (01:36 +0200)
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

index 99cfa28b6d38f12fef3e1e94c07223d83e066e14..ebc5f8894f99eb06b8ef5616cafc06b427dd6a42 100644 (file)
@@ -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) +