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 11C982E2F13; Tue, 15 Jul 2025 13:19:08 +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=1752585548; cv=none; b=p7KBGmPtK9U27B1jL7Xb4e78DsRw2uWOFjWuUiiyZTWAgY1yks96ZNb8/ZgVfYG1oughVe0m73ZDGicYGdi5iiR0gSylPnTRxk00f//2BLOSb4iOfKRp39PRRZjNh/FtSRbCsQa8CpsMo+YNOETnI4anubf3r3OSNYb7GLldBI4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752585548; c=relaxed/simple; bh=OpkJ+0bYBKcd5oUUbpKWaq/8x7ixPgzh9jvUFWZRINQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tE1heEhkkIXohx1+qJ2M2IOx+Ea5sHFig85FL9ujXl+0Ww87R+pmAp0kTToRsRzU+AS9Mwcf+9wKS5/p+ByukRojk6JtC6lkQ+rA6FfUDkOqO5lGKI349pCnUbwNeviw/Kkb1ZF0TolSt5EaPWb8jqizbr9Ycbfuhlj1wnVxgdY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Hm0J78jx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Hm0J78jx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B1A9C4CEE3; Tue, 15 Jul 2025 13:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1752585548; bh=OpkJ+0bYBKcd5oUUbpKWaq/8x7ixPgzh9jvUFWZRINQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hm0J78jxroGsQlbL5rNpZBKdEdMUhf/f3beJXdZnW3aHK/zQSKIyxAPgFKKeJekmq 7/8NHYOatWC9ShJDH7B7YsLS5EVPl2GWAnsAN0d7+PoCX0xdOasBh3lsmJY3v71LF4 G2lole7rbV6DvJYogvX7GvhUHvt3iyIsQueyvVb8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Kuen-Han Tsai , Prashanth K Subject: [PATCH 6.12 080/163] usb: gadget: u_serial: Fix race condition in TTY wakeup Date: Tue, 15 Jul 2025 15:12:28 +0200 Message-ID: <20250715130811.942020359@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250715130808.777350091@linuxfoundation.org> References: <20250715130808.777350091@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kuen-Han Tsai commit c529c3730bd09115684644e26bf01ecbd7e2c2c9 upstream. A race condition occurs when gs_start_io() calls either gs_start_rx() or gs_start_tx(), as those functions briefly drop the port_lock for usb_ep_queue(). This allows gs_close() and gserial_disconnect() to clear port.tty and port_usb, respectively. Use the null-safe TTY Port helper function to wake up TTY. Example CPU1: CPU2: gserial_connect() // lock gs_close() // await lock gs_start_rx() // unlock usb_ep_queue() gs_close() // lock, reset port.tty and unlock gs_start_rx() // lock tty_wakeup() // NPE Fixes: 35f95fd7f234 ("TTY: usb/u_serial, use tty from tty_port") Cc: stable Signed-off-by: Kuen-Han Tsai Reviewed-by: Prashanth K Link: https://lore.kernel.org/linux-usb/20240116141801.396398-1-khtsai@google.com/ Link: https://lore.kernel.org/r/20250617050844.1848232-2-khtsai@google.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/function/u_serial.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/usb/gadget/function/u_serial.c +++ b/drivers/usb/gadget/function/u_serial.c @@ -294,8 +294,8 @@ __acquires(&port->port_lock) break; } - if (do_tty_wake && port->port.tty) - tty_wakeup(port->port.tty); + if (do_tty_wake) + tty_port_tty_wakeup(&port->port); return status; } @@ -577,7 +577,7 @@ static int gs_start_io(struct gs_port *p gs_start_tx(port); /* Unblock any pending writes into our circular buffer, in case * we didn't in gs_start_tx() */ - tty_wakeup(port->port.tty); + tty_port_tty_wakeup(&port->port); } else { /* Free reqs only if we are still connected */ if (port->port_usb) {