netdev - linux-next: manual merge of the net-next tree with Linus' 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>] [day] [month] [year] [list]

Message-ID: <20171030172413.nju5ew5lmt462f6p@sirena.co.uk>
Date:   Mon, 30 Oct 2017 17:24:13 +0000
From:   Mark Brown <broonie@...nel.org>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Yousuk Seung <ysseung@...gle.com>,
        Neal Cardwell <ncardwell@...gle.com>,
        Soheil Hassas Yeganeh <soheil@...gle.com>,
        Yuchung Cheng <ycheng@...gle.com>,
        Eric Dumazet <edumazet@...gle.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
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/ipv4/tcp_output.c

between commit:

  5889e2c0e441d8 ("tcp: call tcp_rate_skb_sent() when retransmit with unaligned skb->data")

from Linus' tree and commit:

  e2080072ed2d98 ("tcp: new list for sent but unacked skbs for RACK recovery")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc net/ipv4/tcp_output.c
index ae60dd3faed0,aab6e7145013..000000000000
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@@ -2840,13 -2905,14 +2907,16 @@@ int __tcp_retransmit_skb(struct sock *s
  		     skb_headroom(skb) >= 0xFFFF)) {
  		struct sk_buff *nskb;
  
- 		nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);
- 		err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :
- 			     -ENOBUFS;
+ 		tcp_skb_tsorted_save(skb) {
+ 			nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);
+ 			err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :
+ 				     -ENOBUFS;
+ 		} tcp_skb_tsorted_restore(skb);
+ 
 -		if (!err)
 +		if (!err) {
- 			skb->skb_mstamp = tp->tcp_mstamp;
+ 			tcp_update_skb_after_send(tp, skb);
 +			tcp_rate_skb_sent(sk, skb);
 +		}
  	} else {
  		err = tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
  	}

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