netdev - linux-next: manual merge of the ipsec-next tree with the net-next 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: <20191216103837.6b5d856b@canb.auug.org.au>
Date:   Mon, 16 Dec 2019 10:38:37 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Steffen Klassert <steffen.klassert@...unet.com>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kirill Tkhai <ktkhai@...tuozzo.com>,
        Sabrina Dubroca <sd@...asysnail.net>
Subject: linux-next: manual merge of the ipsec-next tree with the net-next
 tree

Hi all,

Today's linux-next merge of the ipsec-next tree got a conflict in:

  net/unix/af_unix.c

between commit:

  3c32da19a858 ("unix: Show number of pending scm files of receive queue in fdinfo")

from the net-next tree and commit:

  b50b0580d27b ("net: add queue argument to __skb_wait_for_more_packets and __skb_{,try_}recv_datagram")

from the ipsec-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.

-- 
Cheers,
Stephen Rothwell

diff --cc net/unix/af_unix.c
index 6756a3ccc392,a7f707fc4cac..000000000000
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@@ -2100,8 -2058,8 +2100,8 @@@ static int unix_dgram_recvmsg(struct so
  		mutex_lock(&u->iolock);
  
  		skip = sk_peek_offset(sk, flags);
- 		skb = __skb_try_recv_datagram(sk, flags, scm_stat_del,
- 					      &skip, &err, &last);
+ 		skb = __skb_try_recv_datagram(sk, &sk->sk_receive_queue, flags,
 -					      NULL, &skip, &err, &last);
++					      scm_stat_del, &skip, &err, &last);
  		if (skb)
  			break;
  

Content of type "application/pgp-signature" skipped