From patchwork Thu Oct 26 20:01:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 158673 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp136404vqb; Thu, 26 Oct 2023 13:02:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNoKKw7vV4/OjKJFg9uurkr03YhA9ZO9TdI55D+CgG9eEPrGHesrmy/VprVrMVCc/oBZJL X-Received: by 2002:a1f:ab4b:0:b0:495:ec90:997e with SMTP id u72-20020a1fab4b000000b00495ec90997emr1026161vke.7.1698350528056; Thu, 26 Oct 2023 13:02:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698350528; cv=none; d=google.com; s=arc-20160816; b=Zhw7UxwXcGhzj+7zLFgkpeziStEnKIbc14Phq1ObX4IOFkL+Yy58Fhx/1BymdXv/gT AMpZPe14c+veN5KwCcAJofzsF23Eu2iHv1QSsZBpoQiYxc5ovizrH12cYBLSQZjy1x2C Cmfd774R1gByBN1hJyfjWfdwSVvvhtVXDBQeFlWDxkItaWFbg8+MdFXwS9ozEw92cA1y LPreGwbRaFm2fRsJyLO+RY2frtG5grMhPZ/rFHPhE72B6bYxIrLBpga/5Hhc7OP4Pydi kt3N+LiqRFopYDaQJtSgdnxgDAE/6sd4gkCbTX7xeFgdWduUEPWHIuY/B/oCyasUCZQO ZD+g== 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; bh=w9sbKYXZtIyf/ohQE3Edg07I3no4RCuR4cZPauSieZc=; fh=swjxqjQ9hhASm8GoxkZi+6BQ9X7UYEMXc0fZW0c9whc=; b=UIwrEBMeybIKp18Xl26ueKVz0Th+qZ56SKHES2Ow9wmc/MmhDXOsxBFLi/MBrN1/Jk YRMKlVd1QXPvs1CSrfITbx5HDoslwvnzQAahJcSDq7Qbg1z+L8YUjVplvm+0s5IpYUfp DvmQIaq2Me2XMFwjLSjCCMWsP9flHknJGp0r1kPzb/Uppu+A5IS1F68fIwGY+v5JIA8R +NbWu8V5CaieJ9DJBb6whcoXcRJuTQAWWPZ4Or+cHTKAAGENwvtKVAdPv0BwWRCH8QwX 1avGVeyPM/fLkuWl3WxECWF9FQuENW4O79m4OzdsAP+ittV+TJGxAMU7uje7gz+FUxMU 3OPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=Q6YJK2jt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id r185-20020a1fdac2000000b0049d2cea68cbsi529953vkg.271.2023.10.26.13.02.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 13:02:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=Q6YJK2jt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id DEE168038D81; Thu, 26 Oct 2023 13:02:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231889AbjJZUBb (ORCPT + 26 others); Thu, 26 Oct 2023 16:01:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229991AbjJZUB1 (ORCPT ); Thu, 26 Oct 2023 16:01:27 -0400 Received: from out-184.mta0.migadu.com (out-184.mta0.migadu.com [IPv6:2001:41d0:1004:224b::b8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5F24B9 for ; Thu, 26 Oct 2023 13:01:24 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1698350482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=w9sbKYXZtIyf/ohQE3Edg07I3no4RCuR4cZPauSieZc=; b=Q6YJK2jt8aNtYlz8aXpbXEWd2kqMpPtQi5xuwpIHAqyuf9aFF60iI469yR9sXN+U5jAsl1 Mtp7c9Vc5whZ4u38LKe46DBzYaXVhRTQQCFXcC/gDZVPwZarUGe2TcuOM0l9txxgRMmVIq drqS5ay+gubC+PaR89dnjZTdhkwB61U= From: andrey.konovalov@linux.dev To: Greg Kroah-Hartman Cc: Andrey Konovalov , Alan Stern , Felipe Balbi , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] usb: raw-gadget: properly handle interrupted requests Date: Thu, 26 Oct 2023 22:01:12 +0200 Message-Id: <0db45b1d7cc466e3d4d1ab353f61d63c977fbbc5.1698350424.git.andreyknvl@gmail.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 26 Oct 2023 13:02:05 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780828385608254235 X-GMAIL-MSGID: 1780849603580826719 From: Andrey Konovalov Currently, if a USB request that was queued by Raw Gadget is interrupted (via a signal), wait_for_completion_interruptible returns -ERESTARTSYS. Raw Gadget then attempts to propagate this value to userspace as a return value from its ioctls. However, when -ERESTARTSYS is returned by a syscall handler, the kernel internally restarts the syscall. This doesn't allow userspace applications to interrupt requests queued by Raw Gadget (which is required when the emulated device is asked to switch altsettings). It also violates the implied interface of Raw Gadget that a single ioctl must only queue a single USB request. Instead, make Raw Gadget do what GadgetFS does: check whether the request was interrupted (dequeued with status == -ECONNRESET) and report -EINTR to userspace. Fixes: f2c2e717642c ("usb: gadget: add raw-gadget interface") Signed-off-by: Andrey Konovalov --- drivers/usb/gadget/legacy/raw_gadget.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/usb/gadget/legacy/raw_gadget.c b/drivers/usb/gadget/legacy/raw_gadget.c index b9ecc55a2ce2..ce9e87f84911 100644 --- a/drivers/usb/gadget/legacy/raw_gadget.c +++ b/drivers/usb/gadget/legacy/raw_gadget.c @@ -674,12 +674,12 @@ static int raw_process_ep0_io(struct raw_dev *dev, struct usb_raw_ep_io *io, if (WARN_ON(in && dev->ep0_out_pending)) { ret = -ENODEV; dev->state = STATE_DEV_FAILED; - goto out_done; + goto out_unlock; } if (WARN_ON(!in && dev->ep0_in_pending)) { ret = -ENODEV; dev->state = STATE_DEV_FAILED; - goto out_done; + goto out_unlock; } dev->req->buf = data; @@ -694,7 +694,7 @@ static int raw_process_ep0_io(struct raw_dev *dev, struct usb_raw_ep_io *io, "fail, usb_ep_queue returned %d\n", ret); spin_lock_irqsave(&dev->lock, flags); dev->state = STATE_DEV_FAILED; - goto out_done; + goto out_queue_failed; } ret = wait_for_completion_interruptible(&dev->ep0_done); @@ -703,13 +703,16 @@ static int raw_process_ep0_io(struct raw_dev *dev, struct usb_raw_ep_io *io, usb_ep_dequeue(dev->gadget->ep0, dev->req); wait_for_completion(&dev->ep0_done); spin_lock_irqsave(&dev->lock, flags); - goto out_done; + if (dev->ep0_status == -ECONNRESET) + dev->ep0_status = -EINTR; + goto out_interrupted; } spin_lock_irqsave(&dev->lock, flags); - ret = dev->ep0_status; -out_done: +out_interrupted: + ret = dev->ep0_status; +out_queue_failed: dev->ep0_urb_queued = false; out_unlock: spin_unlock_irqrestore(&dev->lock, flags); @@ -1078,7 +1081,7 @@ static int raw_process_ep_io(struct raw_dev *dev, struct usb_raw_ep_io *io, "fail, usb_ep_queue returned %d\n", ret); spin_lock_irqsave(&dev->lock, flags); dev->state = STATE_DEV_FAILED; - goto out_done; + goto out_queue_failed; } ret = wait_for_completion_interruptible(&done); @@ -1087,13 +1090,16 @@ static int raw_process_ep_io(struct raw_dev *dev, struct usb_raw_ep_io *io, usb_ep_dequeue(ep->ep, ep->req); wait_for_completion(&done); spin_lock_irqsave(&dev->lock, flags); - goto out_done; + if (ep->status == -ECONNRESET) + ep->status = -EINTR; + goto out_interrupted; } spin_lock_irqsave(&dev->lock, flags); - ret = ep->status; -out_done: +out_interrupted: + ret = ep->status; +out_queue_failed: ep->urb_queued = false; out_unlock: spin_unlock_irqrestore(&dev->lock, flags);