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 03B9220C488; Tue, 29 Apr 2025 18:06:40 +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=1745950000; cv=none; b=GnzMaNRpolw0BYZyQ2J1iNwb+PacDh97FjpN/x3tysv9lPQ7oviKyMXTd6VxJGQ0d4OGQCUpmuHaAYzmGW6CnOG19T9JGK68EqjIwIMY/WHH7z3BAchjsgB5hPhD6bkMsM1loknrObbJ1LkAnAj2qe6g4klov7UFpoAzbppmRl8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745950000; c=relaxed/simple; bh=yEncLDGFoAyuBsajXUWsCxk2dHuA1qYA/sFWtzsY2Yo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OaOhMHeB7L9lZji14iiD8aP/BIeCFIdNnSfB7ijH7RznYcTHYfnje9OCaijmK6gX/YFSsHou0tZ/jyY4+Vr774ef2eZjnMm3KMLnSw9aCAGN0QxskhRDWpq/PubOL1R/MDDIKPhvWcY9BGhpECgEoeWmitkDs63iaV11v70Rzwg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mkmJZyxK; 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="mkmJZyxK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80D51C4CEE3; Tue, 29 Apr 2025 18:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745949999; bh=yEncLDGFoAyuBsajXUWsCxk2dHuA1qYA/sFWtzsY2Yo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mkmJZyxKRnv2SSxOXodPxUSU+6Tt5wHiatudmqzNQ1Dc3mhI1yL9bpLB4G0i9zsF1 H5oS/EtjUt56x8yI/htEB9vHT6RTJTkHY+bisAtpF8Ob3XHzIHDDVGKb40EWKHrIrj p3EdoHYX+PFKq5frZGWVBztbIhwiNpCK5BXLV4os= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Oliver Neukum Subject: [PATCH 6.1 094/167] USB: wdm: close race between wdm_open and wdm_wwan_port_stop Date: Tue, 29 Apr 2025 18:43:22 +0200 Message-ID: <20250429161055.559886407@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161051.743239894@linuxfoundation.org> References: <20250429161051.743239894@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 6.1-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)