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  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Date:	Thu, 5 Sep 2013 15:23:08 +1000
From:	Stephen Rothwell <>
To:	David Miller <>, <>
	Hannes Frederic Sowa <>,
	Nicolas Dichtel <>
Subject: linux-next: manual merge of the net-next tree with Linus' tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/ipv6/sit.c between commit 3d483058c8c8 ("ipv6: wire up
skb->encapsulation") from Linus' tree and commit 8b7ed2d91d6a
("iptunnels: remove net arg from iptunnel_xmit()") from the net-next tree.

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

Stephen Rothwell          

diff --cc net/ipv6/sit.c
index 21b25dd,19abcc9..0000000
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@@ -886,13 -881,8 +879,13 @@@ static netdev_tx_t ipip6_tunnel_xmit(st
  		ttl = iph6->hop_limit;
  	tos = INET_ECN_encapsulate(tos, ipv6_get_dsfield(iph6));
 +	if (likely(!skb->encapsulation)) {
 +		skb_reset_inner_headers(skb);
 +		skb->encapsulation = 1;
 +	}
- 	err = iptunnel_xmit(dev_net(dev), rt, skb, fl4.saddr, fl4.daddr,
- 			    IPPROTO_IPV6, tos, ttl, df);
+ 	err = iptunnel_xmit(rt, skb, fl4.saddr, fl4.daddr, IPPROTO_IPV6, tos,
+ 			    ttl, df, !net_eq(tunnel->net, dev_net(dev)));
  	iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
  	return NETDEV_TX_OK;

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists