Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
Date:   Mon, 23 Oct 2023 12:42:00 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Hannes Reinecke <hare@suse.de>, Keith Busch <kbusch@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Sagi Grimberg <sagi@grimberg.me>
Subject: linux-next: manual merge of the block tree with Linus' tree
Message-ID: <20231023124200.38dd410b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/d3N4OZEb57toJpLPWdvRs6z";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/d3N4OZEb57toJpLPWdvRs6z
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/nvme/target/tcp.c

between commit:

  d920abd1e7c4 ("nvmet-tcp: Fix a possible UAF in queue intialization setup=
")

from Linus' tree and commit:

  675b453e0241 ("nvmet-tcp: enable TLS handshake upcall")

from the block tree.

I fixed it up (I am not sure this is necessary - 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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/nvme/target/tcp.c
index 197fc2ecb164,4336fe048e43..000000000000
--- a/drivers/nvme/target/tcp.c
+++ b/drivers/nvme/target/tcp.c
@@@ -910,8 -932,8 +933,10 @@@ static int nvmet_tcp_handle_icreq(struc
  	iov.iov_base =3D icresp;
  	iov.iov_len =3D sizeof(*icresp);
  	ret =3D kernel_sendmsg(queue->sock, &msg, &iov, 1, iov.iov_len);
--	if (ret < 0)
 -		goto free_crypto;
++	if (ret < 0) {
++		queue->state =3D NVMET_TCP_Q_FAILED;
 +		return ret; /* queue removal will cleanup */
++	}
 =20
  	queue->state =3D NVMET_TCP_Q_LIVE;
  	nvmet_prepare_receive_pdu(queue);

--Sig_/d3N4OZEb57toJpLPWdvRs6z
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU1z2gACgkQAVBC80lX
0GxRTgf/WmF5ULtaDAldhJ8rqRyQ0p2AYEPlNW2AEytzKESkmPZXKxQqYlD81xpU
1U+KHAefCzwO585RFsUg72nPgMEjDU4/xA876pMN3ndEIkGlnQTZFjuF6MrtIm38
MAJ1bi2EEYrlaZ0Zmh+0U1dz3QU5OLjL5g6KbmeYvPg8iqNp/CIM7+fmt/tfNcmp
aSjFstLKL6OQNJn09nBfVYxCD8cmCKvjN6EyD7fA2EOF+zYrgDQ0wfJuCP5IvLz+
8x8uKvhp1SkAsEmiXf4U9VLOJkaEuzmfdJjU/QiNUjqNeJJbaRWr1BWQo/Q9Eyo4
1puT1eg+TjeZGRAJDSV5uj+cvx9LuA==
=XXoe
-----END PGP SIGNATURE-----

--Sig_/d3N4OZEb57toJpLPWdvRs6z--