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 EF76F233735; Tue, 29 Apr 2025 17:57:19 +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=1745949440; cv=none; b=iR1e07JSv7M2SgJAP8d7MnqG7675YFDdbGniR6fTGv5rE2hwkwJCF7PogoatLNSO29MDMqLpSo68KYt3vl0IdM6AAQnhimYqqKQvnLwqkJNvJ8WBG+l+iKiJB+VoKmcZXOUxEg+rFUYjU4Krj+Zx22tiyau+kGjqiaqDPt++9RQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745949440; c=relaxed/simple; bh=po+Lh1YGujt9LOAjXS7kYT7dtR7TwbsBYwHXHxQIhWQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p3xRbUyIV47jX1+xAK0Ever6biOFrvEOI1JvFsF/XmZYh0rIk1osXC9+CqErOaTOpperXwUE5VO4esrqIU/WETj9EOEoAzSnfQZS1ZOYHXbBC3RbFhvrTZQTznipTE0I4Xpkq6TVsG6IkXhrUxbOVjB9df2IboCgBLkbihnHkWI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vLdZjkuT; 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="vLdZjkuT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F165C4CEE3; Tue, 29 Apr 2025 17:57:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745949439; bh=po+Lh1YGujt9LOAjXS7kYT7dtR7TwbsBYwHXHxQIhWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vLdZjkuTEiZ8AhJeKvn4Ki94m7pLAgdaljzvx0K2+JTTny9frNQV6GZS1OyRu5AQs DReir0a2QOwAhP8QRQV91FQpSJp5g8GHs6qw+d2ibUEuFW9x8L+YwLX4dRa8bVigjT Py7I9BqD5cYuuNLXWjY03b/ZeQ+YJlDDkOw2HAG0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Oliver Neukum Subject: [PATCH 5.15 320/373] USB: wdm: close race between wdm_open and wdm_wwan_port_stop Date: Tue, 29 Apr 2025 18:43:17 +0200 Message-ID: <20250429161136.287362842@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161123.119104857@linuxfoundation.org> References: <20250429161123.119104857@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oliver Neukum commit c1846ed4eb527bdfe6b3b7dd2c78e2af4bf98f4f upstream. Clearing WDM_WWAN_IN_USE must be the last action or we can open a chardev whose URBs are still poisoned Fixes: cac6fb015f71 ("usb: class: cdc-wdm: WWAN framework integration") Cc: stable Signed-off-by: Oliver Neukum Link: https://lore.kernel.org/r/20250401084749.175246-3-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/class/cdc-wdm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -726,7 +726,7 @@ static int wdm_open(struct inode *inode, rv = -EBUSY; goto out; } - + smp_rmb(); /* ordered against wdm_wwan_port_stop() */ rv = usb_autopm_get_interface(desc->intf); if (rv < 0) { dev_err(&desc->intf->dev, "Error autopm - %d\n", rv); @@ -868,8 +868,10 @@ static void wdm_wwan_port_stop(struct ww poison_urbs(desc); desc->manage_power(desc->intf, 0); clear_bit(WDM_READ, &desc->flags); - clear_bit(WDM_WWAN_IN_USE, &desc->flags); unpoison_urbs(desc); + smp_wmb(); /* ordered against wdm_open() */ + /* this must be last lest we open a poisoned device */ + clear_bit(WDM_WWAN_IN_USE, &desc->flags); } static void wdm_wwan_port_tx_complete(struct urb *urb)