Message ID | 20230306214838.237801-1-pchelkin@ispras.ru |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2101974wrd; Mon, 6 Mar 2023 14:15:38 -0800 (PST) X-Google-Smtp-Source: AK7set+qSaScXPzdqiJK2hNQ5qvaaxXyuwg+JWcUgAAZsxFxbTy29zMXE7QD/TMAY2WOOQJvqhER X-Received: by 2002:aa7:c245:0:b0:4ac:c44e:a493 with SMTP id y5-20020aa7c245000000b004acc44ea493mr11631196edo.2.1678140938682; Mon, 06 Mar 2023 14:15:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678140938; cv=none; d=google.com; s=arc-20160816; b=slYGT6qDrw6xEUmmAt/yM/4VgwzlVfHl0P/ftu8u3xmjwi9jSDoMegGq47Mcnnbzq8 eePu3Ftp1/CU9vWkK4s8K5cQmqI8KLfcrojKtKgyNMJc7EALwbQHcKhixQM2zah2LkJ+ X2hP+/Tf2Ge5pht2h2Xls1JfGhVA//gXxT3GAM0oH7vRtCw5OSiJ5lhiPOQvserq1zoH iIA+WQLUkJ0G/WUr2PiEQ52aRor/pFrir+sTjtY9dcAqFmy7wI4O+J3y5aVH5x3tnxOy lGoHj78PDxTuDEM408qmUcx5incVySQ6UbN4DvS7bZfaSiK+ClQ/1H0vh2OM0O67Fdy/ 3kAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=yijYhlf05IbOT/z5DjPt00NTcmslRmea2xUr3HXD0jo=; b=MFDdBbON9SlicNr8glqSJY9boX3UWC65Y70S7ldjAiAkZv/z20jxZACwBjTYK10BNj D4UcM4PizKN4uCFvQdeLRL2piikZr8ll2DuhhP1goQbRloZSeNkYRr4GGQDMLz2MpLF+ bDAL0W0YS0yPEZKU1utJeKelZ7pgbWyCbCDS1kVUa9c/bGcfj2BnZPCq7l/jLicwxbnq eUxzMQlbgtwuq8yqghatiZUrZRzXhxvH6Mt2BXLMh6qyysD61p+Gsp8pojw/hs8UuDUf H98jM/WTEXprgZ9+pBOINDwara3pCGbBFEn5rcomr1InypTK4ZEoIzXnpOBpTmYD644Q uJaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b="GxXZivZ/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r7-20020aa7d147000000b004acda72375fsi11277485edo.84.2023.03.06.14.15.13; Mon, 06 Mar 2023 14:15:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b="GxXZivZ/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229932AbjCFVtI (ORCPT <rfc822;toshivichauhan@gmail.com> + 99 others); Mon, 6 Mar 2023 16:49:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229619AbjCFVtH (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 6 Mar 2023 16:49:07 -0500 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D65C2B282; Mon, 6 Mar 2023 13:49:06 -0800 (PST) Received: from fpc.intra.ispras.ru (unknown [10.10.165.10]) by mail.ispras.ru (Postfix) with ESMTPSA id 2212240737DF; Mon, 6 Mar 2023 21:49:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 2212240737DF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1678139344; bh=yijYhlf05IbOT/z5DjPt00NTcmslRmea2xUr3HXD0jo=; h=From:To:Cc:Subject:Date:From; b=GxXZivZ/U68xapg8pHx/kCweOtsaNdjUQt3lAqWGKNKuAXHHoEqDXEtpu0Mmserag liZtC8nOHAeZOTYSuQPhOBVlGNhgYa34Bi1AQk2q+EuNQHRMMnQ9Yk2pHvJdZI60c0 DaqQ1M/PuZ5851a2SK/7BwLNYxKDttISyCUanFCk= From: Fedor Pchelkin <pchelkin@ispras.ru> To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Cc: Fedor Pchelkin <pchelkin@ispras.ru>, Jakub Kicinski <kuba@kernel.org>, "David S. Miller" <davem@davemloft.net>, Minsuk Kang <linuxlovemin@yonsei.ac.kr>, Alexey Khoroshilov <khoroshilov@ispras.ru>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, lvc-project@linuxtesting.org, syzbot+1e608ba4217c96d1952f@syzkaller.appspotmail.com Subject: [PATCH] nfc: pn533: initialize struct pn533_out_arg properly Date: Tue, 7 Mar 2023 00:48:38 +0300 Message-Id: <20230306214838.237801-1-pchelkin@ispras.ru> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759658312801324530?= X-GMAIL-MSGID: =?utf-8?q?1759658312801324530?= |
Series |
nfc: pn533: initialize struct pn533_out_arg properly
|
|
Commit Message
Fedor Pchelkin
March 6, 2023, 9:48 p.m. UTC
struct pn533_out_arg used as a temporary context for out_urb is not
initialized properly. Its uninitialized 'phy' field can be dereferenced in
error cases inside pn533_out_complete() callback function. It causes the
following failure:
general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007]
CPU: 1 PID: 0 Comm: swapper/1 Not tainted 6.2.0-rc3-next-20230110-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022
RIP: 0010:pn533_out_complete.cold+0x15/0x44 drivers/nfc/pn533/usb.c:441
Call Trace:
<IRQ>
__usb_hcd_giveback_urb+0x2b6/0x5c0 drivers/usb/core/hcd.c:1671
usb_hcd_giveback_urb+0x384/0x430 drivers/usb/core/hcd.c:1754
dummy_timer+0x1203/0x32d0 drivers/usb/gadget/udc/dummy_hcd.c:1988
call_timer_fn+0x1da/0x800 kernel/time/timer.c:1700
expire_timers+0x234/0x330 kernel/time/timer.c:1751
__run_timers kernel/time/timer.c:2022 [inline]
__run_timers kernel/time/timer.c:1995 [inline]
run_timer_softirq+0x326/0x910 kernel/time/timer.c:2035
__do_softirq+0x1fb/0xaf6 kernel/softirq.c:571
invoke_softirq kernel/softirq.c:445 [inline]
__irq_exit_rcu+0x123/0x180 kernel/softirq.c:650
irq_exit_rcu+0x9/0x20 kernel/softirq.c:662
sysvec_apic_timer_interrupt+0x97/0xc0 arch/x86/kernel/apic/apic.c:1107
Initialize the field with the pn533_usb_phy currently used.
Fixes: 9dab880d675b ("nfc: pn533: Wait for out_urb's completion in pn533_usb_send_frame()")
Reported-by: syzbot+1e608ba4217c96d1952f@syzkaller.appspotmail.com
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
---
drivers/nfc/pn533/usb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Tue, Mar 07, 2023 at 12:48:38AM +0300, Fedor Pchelkin wrote: > struct pn533_out_arg used as a temporary context for out_urb is not > initialized properly. Its uninitialized 'phy' field can be dereferenced in > error cases inside pn533_out_complete() callback function. It causes the > following failure: > > general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN > KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] > CPU: 1 PID: 0 Comm: swapper/1 Not tainted 6.2.0-rc3-next-20230110-syzkaller #0 > Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 > RIP: 0010:pn533_out_complete.cold+0x15/0x44 drivers/nfc/pn533/usb.c:441 > Call Trace: > <IRQ> > __usb_hcd_giveback_urb+0x2b6/0x5c0 drivers/usb/core/hcd.c:1671 > usb_hcd_giveback_urb+0x384/0x430 drivers/usb/core/hcd.c:1754 > dummy_timer+0x1203/0x32d0 drivers/usb/gadget/udc/dummy_hcd.c:1988 > call_timer_fn+0x1da/0x800 kernel/time/timer.c:1700 > expire_timers+0x234/0x330 kernel/time/timer.c:1751 > __run_timers kernel/time/timer.c:2022 [inline] > __run_timers kernel/time/timer.c:1995 [inline] > run_timer_softirq+0x326/0x910 kernel/time/timer.c:2035 > __do_softirq+0x1fb/0xaf6 kernel/softirq.c:571 > invoke_softirq kernel/softirq.c:445 [inline] > __irq_exit_rcu+0x123/0x180 kernel/softirq.c:650 > irq_exit_rcu+0x9/0x20 kernel/softirq.c:662 > sysvec_apic_timer_interrupt+0x97/0xc0 arch/x86/kernel/apic/apic.c:1107 > > Initialize the field with the pn533_usb_phy currently used. > > Fixes: 9dab880d675b ("nfc: pn533: Wait for out_urb's completion in pn533_usb_send_frame()") > Reported-by: syzbot+1e608ba4217c96d1952f@syzkaller.appspotmail.com > Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru> > --- > drivers/nfc/pn533/usb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c > index ed9c5e2cf3ad..159b331b3bf6 100644 > --- a/drivers/nfc/pn533/usb.c > +++ b/drivers/nfc/pn533/usb.c > @@ -162,7 +162,7 @@ static int pn533_usb_send_frame(struct pn533 *dev, > struct sk_buff *out) > { > struct pn533_usb_phy *phy = dev->phy; > - struct pn533_out_arg arg; > + struct pn533_out_arg arg = {.phy = phy}; nit: This doesn't follow reverse xmas tree ordering - longest to shortest line. It's probably not worth respinning, but I expect the preferred approach is (*completely untested!*) ... struct pn533_out_arg arg; ... arg.phy = phy; > void *cntx; > int rc; > > -- > 2.34.1 >
On 06/03/2023 22:48, Fedor Pchelkin wrote: > struct pn533_out_arg used as a temporary context for out_urb is not > initialized properly. Its uninitialized 'phy' field can be dereferenced in > error cases inside pn533_out_complete() callback function. It causes the > following failure: > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Tue, 7 Mar 2023 16:45:30 +0100 Simon Horman wrote: > nit: This doesn't follow reverse xmas tree ordering - longest to shortest line. > It's probably not worth respinning, but I expect the preferred > approach is (*completely untested!*) > > ... > struct pn533_out_arg arg; > ... > > arg.phy = phy; Let's do it this way. And please make sure that the patch is based on top of the netdev/net tree from git.kernel.org, looks like this version doesn't apply cleanly.
On Tue, Mar 07, 2023 at 04:45:30PM +0100, Simon Horman wrote: > > nit: This doesn't follow reverse xmas tree ordering - longest to shortest line. > It's probably not worth respinning, but I expect the preferred > approach is (*completely untested!*) > > ... > struct pn533_out_arg arg; > ... > > arg.phy = phy; > That is much prettier, thanks for advice! BTW, is reverse xmas tree ordering considered to be a general recommendation for all new kernel patches?
On Thu, Mar 09, 2023 at 07:10:25PM +0300, Fedor Pchelkin wrote: > On Tue, Mar 07, 2023 at 04:45:30PM +0100, Simon Horman wrote: > > > > nit: This doesn't follow reverse xmas tree ordering - longest to shortest line. > > It's probably not worth respinning, but I expect the preferred > > approach is (*completely untested!*) > > > > ... > > struct pn533_out_arg arg; > > ... > > > > arg.phy = phy; > > > > That is much prettier, thanks for advice! > > BTW, is reverse xmas tree ordering considered to be a general > recommendation for all new kernel patches? I think that the situation is that some subsystem maintainers require it, while other's do not. So no.
diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c index ed9c5e2cf3ad..159b331b3bf6 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c @@ -162,7 +162,7 @@ static int pn533_usb_send_frame(struct pn533 *dev, struct sk_buff *out) { struct pn533_usb_phy *phy = dev->phy; - struct pn533_out_arg arg; + struct pn533_out_arg arg = {.phy = phy}; void *cntx; int rc;