Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 27 Jul 2020 13:44:33 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Marcel Holtmann <marcel@holtmann.org>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Alain Michaud <alainm@chromium.org>,
        Christoph Hellwig <hch@lst.de>
Subject: linux-next: build failure after merge of the bluetooth tree
Message-ID: <20200727134433.1c4ea34e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/i4OPhDal54JmQi0C2gX3Cv0";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

Hi all,

After merging the bluetooth tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

net/bluetooth/sco.c: In function 'sco_sock_setsockopt':
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type
  862 |   if (get_user(opt, (u32 __user *)optval)) {
      |   ^~
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type

Caused by commit

  00398e1d5183 ("Bluetooth: Add support for BT_PKT_STATUS CMSG data for SCO=
 connections")

interacting with commit

  a7b75c5a8c41 ("net: pass a sockptr_t into ->setsockopt")

from the net-next tree.

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 27 Jul 2020 13:41:30 +1000
Subject: [PATCH] Bluetooth: fix for introduction of sockptr_t

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/bluetooth/sco.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 6e6b03844a2a..dcf7f96ff417 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -859,7 +859,7 @@ static int sco_sock_setsockopt(struct socket *sock, int=
 level, int optname,
 		break;
=20
 	case BT_PKT_STATUS:
-		if (get_user(opt, (u32 __user *)optval)) {
+		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
 			err =3D -EFAULT;
 			break;
 		}
--=20
2.27.0

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8eTaEACgkQAVBC80lX
0GxveAf9E0YoKtcwDaOdLI7Klv7Asr/se/R9oTCS//szh1Vp2vzEbGnnP7z5KKAG
RY2D7lSSgrF/UTzBtRc3atsNajtmO1ObBOkF7JlmG8A2un02Q2rV0OeKV9Kg8vs2
PWRi0NTOAddtqAMn/sdzMuXswKR/E8Jr79XTd4o2OxWZHmRXTb8QDjf4Lq0FrYw7
Yy1LqJmoHVrb3WKsxQjywTk0GfkUXyoFsZ4GLm8Aa+VX80HOPDydrBlhvcPsSMrY
8Dmq1u5ieG2JFBI5b9APr9zOkT38NE8YryA6oSSJ/cMJlUtn/pPFfqRuWvrPVW2G
AjclIANAIA7iX7X/0Lys8uZJq3TlKQ==
=/9Zv
-----END PGP SIGNATURE-----

--Sig_/i4OPhDal54JmQi0C2gX3Cv0--