From patchwork Mon Jul 27 03:44:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1336604 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=JnAOtWJ2; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BFQg51FRFz9sPB for ; Mon, 27 Jul 2020 13:45:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726805AbgG0Doi (ORCPT ); Sun, 26 Jul 2020 23:44:38 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:35563 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726666AbgG0Doh (ORCPT ); Sun, 26 Jul 2020 23:44:37 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4BFQfV5d2cz9sRR; Mon, 27 Jul 2020 13:44:34 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1595821476; bh=tSzjNT8u43gZrwdrTJb/CVyGDvl8I6ezLnCXyQXH9DU=; h=Date:From:To:Cc:Subject:From; b=JnAOtWJ2EmAulpLGuhw5AunWdiOMLN2qoPrSpZ5g/7Mwrh4OS/C4nJwYL2Jb97DUQ VKcwEGAhtiqZLw4qZZXRUUOVhgQhVyqfNCvxrINUYcHKpQUHr2oOjIgjTCpHeXsWvQ Ukpc2uLkEXlcVH/zyPOuDwExwdRg1XLq9ZVh7oDWvn3wXTPRJnYCycKAe3QaDxUBYh NDUOGK3kmXLXrlWuaeVYkFgQs2YTR4hjIHKN1W9FN3gbvQUcGdurK00LuO5XV7yGYC /FSwuNq9hjj7JXd2T/xQy18w9hCA+aJu60JIM7+Dy7lYpQckUungMP0A6n5Q69JW5G ogEpQemIWWHFg== Date: Mon, 27 Jul 2020 13:44:33 +1000 From: Stephen Rothwell To: Marcel Holtmann , Johan Hedberg , David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Alain Michaud , Christoph Hellwig Subject: linux-next: build failure after merge of the bluetooth tree Message-ID: <20200727134433.1c4ea34e@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Date: Mon, 27 Jul 2020 13:41:30 +1000 Subject: [PATCH] Bluetooth: fix for introduction of sockptr_t Signed-off-by: Stephen Rothwell --- 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; }