From patchwork Mon Apr 19 03:37:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anirudh Rayabharam X-Patchwork-Id: 424289 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A31EC433ED for ; Mon, 19 Apr 2021 03:38:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D32C56024A for ; Mon, 19 Apr 2021 03:38:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232943AbhDSDia (ORCPT ); Sun, 18 Apr 2021 23:38:30 -0400 Received: from sender4-of-o53.zoho.com ([136.143.188.53]:21363 "EHLO sender4-of-o53.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232317AbhDSDi3 (ORCPT ); Sun, 18 Apr 2021 23:38:29 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1618803469; cv=none; d=zohomail.com; s=zohoarc; b=RI0Uk+zESVya/wuuzytXA0pDsL16ksilhs9cDufYoXso8jBk1qFFaBa+sS8SP0UKrdQ/Nu+wQuks3U7ll4LwOd6KaeIcth73LhfJgbZ+wXOOhcgolUy0bT+Fd4AO0s6k8zCQf1/SxirSZk2QljREXQNZCbYSJKDz6Dd0MstB7zQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618803469; h=Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=YnCdv7AAProKmkZa307kJK+CEziv1AFNL+Zdo7moFS8=; b=K86FT328X7Lv+6gDIwS30j8QoW5WEI2Bo3ZN2me8FrkJ5Egnh+y3P+5hO6l83Dhjw7p23FZ0aF+f/XyFf5+gw1dBoWc3YvQVx5ObCq4SUH/c8aXUKmEo8cZ+V6FNADs+Xe5q72SfoKsMwkQ40K1cwGTCpTuFqXdN3oMf8G8Y9Dg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=anirudhrb.com; spf=pass smtp.mailfrom=mail@anirudhrb.com; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1618803469; s=zoho; d=anirudhrb.com; i=mail@anirudhrb.com; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Transfer-Encoding; bh=YnCdv7AAProKmkZa307kJK+CEziv1AFNL+Zdo7moFS8=; b=oo3xJV2ga/e9QQTxjmr5kpmRbd8pO5Ek97Slg9U2EXtltDA6jf50eHh8QAH0ijNJ Snr3tPPArIna3V8DGn1poS4icQSy7IYX7z+i5TCza4ew6Fk1EanWmrRp2XfmzzYnCAm ll1X5lco7u0Kv+ibosXT4IsCYNEqIIE6qZUqQ00E= Received: from localhost.localdomain (49.207.216.151 [49.207.216.151]) by mx.zohomail.com with SMTPS id 1618803466573950.1264699537642; Sun, 18 Apr 2021 20:37:46 -0700 (PDT) From: Anirudh Rayabharam To: Felipe Balbi , Greg Kroah-Hartman , Alan Stern , Colin Ian King , "Gustavo A. R. Silva" , Jules Irenge , Bui Quang Minh , Anirudh Rayabharam , Andrey Konovalov Cc: linux-kernel-mentees@lists.linuxfoundation.org, syzbot+eb4674092e6cc8d9e0bd@syzkaller.appspotmail.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] usb: gadget: dummy_hcd: fix gpf in gadget_setup Date: Mon, 19 Apr 2021 09:07:08 +0530 Message-Id: <20210419033713.3021-1-mail@anirudhrb.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Fix a general protection fault reported by syzbot due to a race between gadget_setup() and gadget_unbind() in raw_gadget. The gadget core is supposed to guarantee that there won't be any more callbacks to the gadget driver once the driver's unbind routine is called. That guarantee is enforced in usb_gadget_remove_driver as follows: usb_gadget_disconnect(udc->gadget); if (udc->gadget->irq) synchronize_irq(udc->gadget->irq); udc->driver->unbind(udc->gadget); usb_gadget_udc_stop(udc); usb_gadget_disconnect turns off the pullup resistor, telling the host that the gadget is no longer connected and preventing the transmission of any more USB packets. Any packets that have already been received are sure to processed by the UDC driver's interrupt handler by the time synchronize_irq returns. But this doesn't work with dummy_hcd, because dummy_hcd doesn't use interrupts; it uses a timer instead. It does have code to emulate the effect of synchronize_irq, but that code doesn't get invoked at the right time -- it currently runs in usb_gadget_udc_stop, after the unbind callback instead of before. Indeed, there's no way for usb_gadget_remove_driver to invoke this code before the unbind callback. To fix this, move the synchronize_irq() emulation code to dummy_pullup so that it runs before unbind. Also, add a comment explaining why it is necessary to have it there. Suggested-by: Alan Stern Reported-by: syzbot+eb4674092e6cc8d9e0bd@syzkaller.appspotmail.com Acked-by: Alan Stern Signed-off-by: Anirudh Rayabharam --- Changes in v2: Improvements in the comment as suggested by Alan Stern. v1: https://lore.kernel.org/lkml/20210417125212.6274-1-mail@anirudhrb.com/ --- drivers/usb/gadget/udc/dummy_hcd.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c index ce24d4f28f2a..7db773c87379 100644 --- a/drivers/usb/gadget/udc/dummy_hcd.c +++ b/drivers/usb/gadget/udc/dummy_hcd.c @@ -903,6 +903,21 @@ static int dummy_pullup(struct usb_gadget *_gadget, int value) spin_lock_irqsave(&dum->lock, flags); dum->pullup = (value != 0); set_link_state(dum_hcd); + if (value == 0) { + /* + * Emulate synchronize_irq(): wait for callbacks to finish. + * This seems to be the best place to emulate the call to + * synchronize_irq() that's in usb_gadget_remove_driver(). + * Doing it in dummy_udc_stop() would be too late since it + * is called after the unbind callback and unbind shouldn't + * be invoked until all the other callbacks are finished. + */ + while (dum->callback_usage > 0) { + spin_unlock_irqrestore(&dum->lock, flags); + usleep_range(1000, 2000); + spin_lock_irqsave(&dum->lock, flags); + } + } spin_unlock_irqrestore(&dum->lock, flags); usb_hcd_poll_rh_status(dummy_hcd_to_hcd(dum_hcd)); @@ -1004,14 +1019,6 @@ static int dummy_udc_stop(struct usb_gadget *g) spin_lock_irq(&dum->lock); dum->ints_enabled = 0; stop_activity(dum); - - /* emulate synchronize_irq(): wait for callbacks to finish */ - while (dum->callback_usage > 0) { - spin_unlock_irq(&dum->lock); - usleep_range(1000, 2000); - spin_lock_irq(&dum->lock); - } - dum->driver = NULL; spin_unlock_irq(&dum->lock);