From patchwork Thu Oct 26 14:23:59 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: 158561 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp715349vqb; Thu, 26 Oct 2023 07:24:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEkiDk0aqeSDJU17MHSbwiiiPMIBhCbMCkNE/d+G2WwcziHzvB6yxN3Z9sN6Xcakk8ZDg8Z X-Received: by 2002:a05:6808:1895:b0:3ac:b73a:757f with SMTP id bi21-20020a056808189500b003acb73a757fmr18556038oib.39.1698330293558; Thu, 26 Oct 2023 07:24:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698330293; cv=none; d=google.com; s=arc-20160816; b=WLdtR0M25K6/X1Av6vNaqlbN1qpFR6eNVlSAuyxzx+VtZEfm3yxGYScmaxxlSK8V0U 8x6jQOHzCvDb3HkwOYeh9Eh5Vk+/sTfZVoB+nq7r9TnBcPXFDXwIZsYZHXbelgEvaMRn xxFCTTzZ/71J42IM/nyxbiwnJHVck73aYEgCbtXgVUjpr9HlnlsKhxGSXDztEXtC2i/v qxnIuinDGPIWlfIhWvcpXARIg7IPj3QHDIUAmkKY2R0NxBiramL9d89I5k8VX9Shj8cN +/ksPK2jvfWQIUTi5yuSPdBEBtlgdwn7t+Te3mxKsGnrndd+xMNTSTJWaxrEFCRtIQ6U qL4g== 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=q6dJyfmJ5aFZN8bWGYgWdkT0uTkQR5Dhijz5GpOkTmI=; b=ieOHnhG2xTdFxozqgtMjH3pwnf5Bk72sngLTmoGe5n90hZTNr8HU3M/+heElHBGnaV qaJKqJ2jCI0pRO/Ggh8OEU1xgAJtZyX94ogxKZ8rl1Wd/SaM4CdAJxHyEoxTrDfXWJcM eCafZJa833zlbUwbNT1xOy1EJlhhENyKK1gxihnf9PTTrQJSo+dhthGfmuNF56KEZ/2H OGy94lcR2bU+MJYkQp4ig0nIxCTfvYpPX/pPVPo1OlllAKkrOpjGv0XvjT5WC80O52yN eDyE7XLVoXFHXTiBK+u8OlCoL4gGTtvvjYNjO1uFq3kK+l2Z/nydCW8pZyD/xGwdYPNT 9kgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=pzsjr0LI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id x130-20020a254a88000000b00da07b0da758si5100637yba.6.2023.10.26.07.24.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 07:24:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=pzsjr0LI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 086DB80D6529; Thu, 26 Oct 2023 07:24:44 -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 S1345225AbjJZOYQ (ORCPT + 26 others); Thu, 26 Oct 2023 10:24:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234902AbjJZOYO (ORCPT ); Thu, 26 Oct 2023 10:24:14 -0400 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B6009C for ; Thu, 26 Oct 2023 07:24:09 -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=1698330247; 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=pzsjr0LIp7pb/XtXqknldRSmwBGEupiwm0vXOysw+nZ5AkXmX4Mn1tMREjMwSEl1PyRTR0 RrMsQuW1oZ48xwGaxHMFSSgLkkxejvAhXprLAJpRUHicqO6wsJEoffVlR2iFc5eZDF6NBS lUlaaOHetFd8DugXkRNuZ/UPPwd0ufs= From: andrey.konovalov@linux.dev To: Greg Kroah-Hartman , Alan Stern Cc: Andrey Konovalov , Felipe Balbi , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] usb: raw-gadget: properly handle interrupted requests Date: Thu, 26 Oct 2023 16:23:59 +0200 Message-Id: <0db45b1d7cc466e3d4d1ab353f61d63c977fbbc5.1698329862.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 07:24:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780828385608254235 X-GMAIL-MSGID: 1780828385608254235 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);