From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60B6B524F for ; Sat, 18 Oct 2025 01:22:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760750543; cv=none; b=RyJYLqSq6fiq+fI0KKoRefOjzMkE+LendE5gU2w5uws8trJNmfUcH5fvXUuTuiGtPzMLRWCCpBYfr2rh6w5jpslYKI/xkgKujsPbM/a3xapAHAI9blURBjQzCcKlRgeN/NchLiPUex46aAEO0TUM2OEJpxgMo5zXpRMGcmYjBr4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760750543; c=relaxed/simple; bh=Go4HfertDhLQViVY8P4j/zyXoenvBrOXbBznltDuYEs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VAvm5Zt4ArEyDF2T6o69dguGKblJkbsdlCXfMMPRB4drsdwiLL1V5T+prjYPOTqWjRoYYbUuja61LWfDTVpLdoCI0fWxoDhlhMh921ztkWqWWuTidDX6Nq6jPH6lBqBQmD/IfwEcSfqoTgOE1RQKjNSnEd4YS7FhBRi0oaujcE8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k39yJenE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="k39yJenE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50407C4CEE7; Sat, 18 Oct 2025 01:22:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760750541; bh=Go4HfertDhLQViVY8P4j/zyXoenvBrOXbBznltDuYEs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k39yJenE0uZcXcC8NH8ZkU4ocQjSytCr8OoPNBWu0PK3r9sDHqsk9UFyzDu2LxXHc IXww6t/PBYk0AslfqrY1jKV2qo+lD1AmQgbitw/F0DesuihpRBmaZdVPKedXNhernv v2SuRhCUGdWzgx8OJ9yenfmhmlTFosVCk7P5njv03tG+uG8E6CWK9FJ78fJTCRcmWp daqsd74prJCopApgMEfhJ+tzc3ggER/uC5ylm53RfujR4YtuNB0y6ir1oWxbuk6Xax fg2wWZOUlUWZGodLDI8VgWCOUjs+NQfV1/DLiYk0qEWIQH4IwbZHMcwWo3DTj9fE0t uByjqQRX4rRiA== From: Sasha Levin To: stable@vger.kernel.org Cc: Kuen-Han Tsai , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1.y 1/3] usb: gadget: Store endpoint pointer in usb_request Date: Fri, 17 Oct 2025 21:22:15 -0400 Message-ID: <20251018012217.128900-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025101658-deafening-erasable-d73e@gregkh> References: <2025101658-deafening-erasable-d73e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Kuen-Han Tsai [ Upstream commit bfb1d99d969fe3b892db30848aeebfa19d21f57f ] Gadget function drivers often have goto-based error handling in their bind paths, which can be bug-prone. Refactoring these paths to use __free() scope-based cleanup is desirable, but currently blocked. The blocker is that usb_ep_free_request(ep, req) requires two parameters, while the __free() mechanism can only pass a pointer to the request itself. Store an endpoint pointer in the struct usb_request. The pointer is populated centrally in usb_ep_alloc_request() on every successful allocation, making the request object self-contained. Signed-off-by: Kuen-Han Tsai Link: https://lore.kernel.org/r/20250916-ready-v1-1-4997bf277548@google.com Signed-off-by: Greg Kroah-Hartman Link: https://lore.kernel.org/r/20250916-ready-v1-1-4997bf277548@google.com Stable-dep-of: 75a5b8d4ddd4 ("usb: gadget: f_ncm: Refactor bind path to use __free()") Signed-off-by: Sasha Levin --- drivers/usb/gadget/udc/core.c | 3 +++ include/linux/usb/gadget.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index 5adb6e831126a..d98da3c44ff5e 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -194,6 +194,9 @@ struct usb_request *usb_ep_alloc_request(struct usb_ep *ep, req = ep->ops->alloc_request(ep, gfp_flags); + if (req) + req->ep = ep; + trace_usb_ep_alloc_request(ep, req, req ? 0 : -ENOMEM); return req; diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index 705b76f8dddb2..9a4d800cdc1e3 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -31,6 +31,7 @@ struct usb_ep; /** * struct usb_request - describes one i/o request + * @ep: The associated endpoint set by usb_ep_alloc_request(). * @buf: Buffer used for data. Always provide this; some controllers * only use PIO, or don't use DMA for some endpoints. * @dma: DMA address corresponding to 'buf'. If you don't set this @@ -96,6 +97,7 @@ struct usb_ep; */ struct usb_request { + struct usb_ep *ep; void *buf; unsigned length; dma_addr_t dma; -- 2.51.0