public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed
* Re: linux-next: build failure after merge of the bluetooth tree
@ 2023-07-20 22:21 Iwashima, Kuniyuki
  0 siblings, 0 replies; 17+ messages in thread
From: Iwashima, Kuniyuki @ 2023-07-20 22:21 UTC (permalink / raw)
  To: Stephen Rothwell, Jakub Kicinski
  Cc: Von Dentz, Luiz, Marcel Holtmann, Johan Hedberg,
	Linux Kernel Mailing List, Linux Next Mailing List, David Miller,
	Paolo Abeni, Networking, Alexander Mikhalitsyn,
	Iwashima, Kuniyuki, Iwashima, Kuniyuki

From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 21 Jul 2023 08:12:58 +1000
> Hi Jakub,
> 
> On Thu, 20 Jul 2023 08:14:30 -0700 Jakub Kicinski <kuba@kernel•org> wrote:
> >
> > On Wed, 19 Jul 2023 20:24:35 -0700 Jakub Kicinski wrote:
> > > On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:  
> > > > Sorry for not replying inline, outlook on android, we use scm_recv
> > > > not scm_recv_unix, so Id assume that change would return the initial
> > > > behavior, if it did not then it is not fixing anything.    
> > >
> > > Ack, that's what it seems like to me as well.
> > >
> > > I fired up an allmodconfig build of linux-next. I should be able
> > > to get to the bottom of this in ~20min :)  
> >
> > I kicked it off and forgot about it.
> > allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S
> 
> Of course it does, as commit
> 
> 817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> 
> is reverted in linux-next.  The question is "Does the bluetooth tree
> build?" or "Does the net-next tree build *if* you merge the bluetooth
> tree into it?"

FWIW, I was able to built net-next with the commit yesterday.

---8<---
$ grep CONFIG_BT .config
CONFIG_BT=m
CONFIG_BT_BREDR=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_LE_L2CAP_ECRED=y
CONFIG_BT_LEDS=y
CONFIG_BT_MSFTEXT=y
CONFIG_BT_AOSPEXT=y
CONFIG_BT_DEBUGFS=y
CONFIG_BT_SELFTEST=y
CONFIG_BT_SELFTEST_ECDH=y
CONFIG_BT_SELFTEST_SMP=y
CONFIG_BT_FEATURE_DEBUG=y
CONFIG_BT_INTEL=m
CONFIG_BT_BCM=m
CONFIG_BT_RTL=m
CONFIG_BT_MTK=m
CONFIG_BT_HCIBTUSB=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_POLL_SYNC=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB_MTK=y
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_AG6XX=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBCM4377=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIBT3C=m
CONFIG_BT_HCIBLUECARD=m
CONFIG_BT_HCIVHCI=m
CONFIG_BT_MRVL=m
CONFIG_BT_ATH3K=m
CONFIG_BT_VIRTIO=m
---8<---


^ permalink raw reply	[flat|nested] 17+ messages in thread
* linux-next: build failure after merge of the bluetooth tree
@ 2020-07-27  3:44 Stephen Rothwell
  2020-07-27  5:22 ` Christoph Hellwig
  0 siblings, 1 reply; 17+ messages in thread
From: Stephen Rothwell @ 2020-07-27  3:44 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Alain Michaud,
	Christoph Hellwig

[-- Attachment #1: Type: text/plain, Size: 1490 bytes --]

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;
 
 	case BT_PKT_STATUS:
-		if (get_user(opt, (u32 __user *)optval)) {
+		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
 			err = -EFAULT;
 			break;
 		}
-- 
2.27.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply related	[flat|nested] 17+ messages in thread
[parent not found: <20150914101428.13d5ec2d@canb.auug.org.au>]
end of thread, other threads:[~2023-07-20 23:30 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <PH0PR11MB51269B6805230AB8ED209B14D332A@PH0PR11MB5126.namprd11.prod.outlook.com>
2023-07-20  0:50 ` linux-next: build failure after merge of the bluetooth tree Stephen Rothwell
2023-07-20  1:24   ` Jakub Kicinski
2023-07-20  3:00     ` Stephen Rothwell
     [not found]       ` <PH0PR11MB5126763E5913574B8ED6BDE4D33EA@PH0PR11MB5126.namprd11.prod.outlook.com>
2023-07-20  3:24         ` Jakub Kicinski
2023-07-20  6:00           ` Alexander Mikhalitsyn
2023-07-20 15:14           ` Jakub Kicinski
2023-07-20 15:21             ` Alexander Mikhalitsyn
2023-07-20 22:19               ` Stephen Rothwell
2023-07-20 22:12             ` Stephen Rothwell
2023-07-20 23:27               ` Jakub Kicinski
2023-07-20 23:30                 ` Stephen Rothwell
2023-07-20 22:21 Iwashima, Kuniyuki
  -- strict thread matches above, loose matches on Subject: below --
2020-07-27  3:44 Stephen Rothwell
2020-07-27  5:22 ` Christoph Hellwig
2020-07-27 13:28   ` Alain Michaud
     [not found] <20150914101428.13d5ec2d@canb.auug.org.au>
     [not found] ` <20150914102234.38df8b11@canb.auug.org.au>
2015-09-22  1:20   ` Stephen Rothwell
2015-09-22  3:42     ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox