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 8B04640DFB5 for ; Sun, 12 Apr 2026 01:47:18 +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=1775958438; cv=none; b=JydwQmTc3QykZh7hYzlVH30dVOSJtVsCsAsedpebeMF++NttrTHEFn4KRAqngnUdji8rGtB00Zf0+0crrrNrLEO1NMBuyKMAtEzN9GZ2S/9CD3WI+7fVlPeKEMLXyUxU/2psV1e3HKG6N8HD0AHmd6rgsxUiDRdzZQvHUSwMMa4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775958438; c=relaxed/simple; bh=xoIaJT52aIDyFZnjIH6heNUD7F90mEBFawUXYXWILH0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dC9RNNawfM3rhfKGFg0l4G0UY4IKidTLVi2pSncVTMHWlRgRjZp88i+OxOF5kw8ght8ApIn1sFsWICrmgS+1/UitG0SxUTOcNbAcicVggEAMvub2BJtHt6JzAejQNqfumCsdU+l3CjMMLbR9ABLTI9UkRMwCuaZCZ/oFyqfChkw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FqNPVmR/; 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="FqNPVmR/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8938DC116C6; Sun, 12 Apr 2026 01:47:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775958438; bh=xoIaJT52aIDyFZnjIH6heNUD7F90mEBFawUXYXWILH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FqNPVmR/KmNuRGS/jHooBZEgEqGhum9kGmFS2eumeniJ3KzBakyTnXR3kCCe6rbJA Gh9rsuixUCDuoUZSexvgk2RhZOR7H2/A06+J3TT6sPlKt5KydTyNIdv5iROVVrYT8v C+uObkDuS+4Od3IU+e+356/hgfC1gP3xKL07jttF1q0tXrDZH2JKz8evja8y1Fxp6n y4YMEHWmAzUbmVatA3vVoOq+F7+SaryRQr7Wmea4nROTMFnnmuS8Ww8JslOMB6DhjI bSTMUP9V9hy7174tTdfb5wCgAXlbmcU7eJAFSttA5paWPXlKB6iZQLmE+ldIm9Sxgi 0ZHmvEiAyGflA== From: Sasha Levin To: stable@vger.kernel.org Cc: Michael Zimmermann , stable , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1.y] usb: gadget: f_hid: move list and spinlock inits from bind to alloc Date: Sat, 11 Apr 2026 21:47:15 -0400 Message-ID: <20260412014715.1926028-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026040826-sternness-halt-9929@gregkh> References: <2026040826-sternness-halt-9929@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: Michael Zimmermann [ Upstream commit 4e0a88254ad59f6c53a34bf5fa241884ec09e8b2 ] There was an issue when you did the following: - setup and bind an hid gadget - open /dev/hidg0 - use the resulting fd in EPOLL_CTL_ADD - unbind the UDC - bind the UDC - use the fd in EPOLL_CTL_DEL When CONFIG_DEBUG_LIST was enabled, a list_del corruption was reported within remove_wait_queue (via ep_remove_wait_queue). After some debugging I found out that the queues, which f_hid registers via poll_wait were the problem. These were initialized using init_waitqueue_head inside hidg_bind. So effectively, the bind function re-initialized the queues while there were still items in them. The solution is to move the initialization from hidg_bind to hidg_alloc to extend their lifetimes to the lifetime of the function instance. Additionally, I found many other possibly problematic init calls in the bind function, which I moved as well. Signed-off-by: Michael Zimmermann Cc: stable Link: https://patch.msgid.link/20260331184844.2388761-1-sigmaepsilon92@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/f_hid.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c index c20d3426571ec..de00785fa183d 100644 --- a/drivers/usb/gadget/function/f_hid.c +++ b/drivers/usb/gadget/function/f_hid.c @@ -996,13 +996,8 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) if (status) goto fail; - spin_lock_init(&hidg->write_spinlock); hidg->write_pending = 1; hidg->req = NULL; - spin_lock_init(&hidg->read_spinlock); - init_waitqueue_head(&hidg->write_queue); - init_waitqueue_head(&hidg->read_queue); - INIT_LIST_HEAD(&hidg->completed_out_req); /* create char device */ cdev_init(&hidg->cdev, &f_hidg_fops); @@ -1272,6 +1267,12 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) mutex_lock(&opts->lock); ++opts->refcnt; + spin_lock_init(&hidg->write_spinlock); + spin_lock_init(&hidg->read_spinlock); + init_waitqueue_head(&hidg->write_queue); + init_waitqueue_head(&hidg->read_queue); + INIT_LIST_HEAD(&hidg->completed_out_req); + device_initialize(&hidg->dev); hidg->dev.release = hidg_release; hidg->dev.class = hidg_class; -- 2.53.0