netdev - linux-next: manual merge of the net-next tree with the ipsec tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140513135322.3dfadb7c@canb.auug.org.au>
Date:	Tue, 13 May 2014 13:53:22 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Steffen Klassert <steffen.klassert@...unet.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	WANG Cong <xiyou.wangcong@...il.com>
Subject: linux-next: manual merge of the net-next tree with the ipsec tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/ipv6/xfrm6_output.c between commit 5596732fa8c1 ("xfrm: Fix crash
with ipv6 IPsec tunnel and NAT") from the ipsec tree and commit
60ff746739bf ("net: rename local_df to ignore_df") from the net-next
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc net/ipv6/xfrm6_output.c
index b930d080c66f,f47c8b153dd3..000000000000
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@@ -114,7 -114,13 +114,7 @@@ int xfrm6_prepare_output(struct xfrm_st
  	if (err)
  		return err;
  
- 	skb->local_df = 1;
 -	memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
 -#ifdef CONFIG_NETFILTER
 -	IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
 -#endif
 -
 -	skb->protocol = htons(ETH_P_IPV6);
+ 	skb->ignore_df = 1;
  
  	return x->outer_mode->output2(x, skb);
  }

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)