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 3331014D28F; Tue, 23 Apr 2024 21:46:56 +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=1713908816; cv=none; b=UlGOb2kCeCHvKxga7AvAUor5NxmwlKzRi4YN1PEQwYsZHaxeS7vZmdBI1bDwdF7OxFHFyN57kQX7f8xmgdy7gb7c2qI2WQQLmUHrLZbn3G+JMHcPpNmWoGx3BZpVcIMBeVfcjqh81KUtxZTnHmL5ZFG/mRCPOZAGRfyjA+ucPIM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713908816; c=relaxed/simple; bh=+IKtsH5EfPxX4eVsxn0wDwW6YS6M7MhMgBMKCCEEXf4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lSngBKhBAdeSlWIAGs3JaqkYsvUq1qhFooLxC1NeoGS4kTt5JWXpvYsNNp+Hlu40Nl+tIb8IkVCBCHDMRXfTk68VMWCx8QAnl6URWU2cCiaKboFu82lNJjJtPMVKm5PHRRLQtb9AombVUEr0uIxEeWf3RBv6hWRtSMGDZObHEvc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zerYNdlL; 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="zerYNdlL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 068B4C116B1; Tue, 23 Apr 2024 21:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1713908816; bh=+IKtsH5EfPxX4eVsxn0wDwW6YS6M7MhMgBMKCCEEXf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zerYNdlLvOji5kE3rWEl2HE3Z6S1aWDU8jLKsZqTczxfeiVHh3cqvjkCu+bV/Bny2 L1BGsLe+2vlm5E/TIG8mYH77pB4JgEYvnPDjRfS5Zh/zO0f3T6A6L9stmga+ExRrkA p3K2dxa6Wc97bnaKpPxzxADboAXSKW0br6Ri0DW4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, ": Aleksander Morgado" , stable , Oliver Neukum , =?UTF-8?q?Bj=C3=B8rn=20Mork?= Subject: [PATCH 5.15 52/71] Revert "usb: cdc-wdm: close race between read and workqueue" Date: Tue, 23 Apr 2024 14:40:05 -0700 Message-ID: <20240423213845.976246095@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240423213844.122920086@linuxfoundation.org> References: <20240423213844.122920086@linuxfoundation.org> User-Agent: quilt/0.67 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman commit 1607830dadeefc407e4956336d9fcd9e9defd810 upstream. This reverts commit 339f83612f3a569b194680768b22bf113c26a29d. It has been found to cause problems in a number of Chromebook devices, so revert the change until it can be brought back in a safe way. Link: https://lore.kernel.org/r/385a3519-b45d-48c5-a6fd-a3fdb6bec92f@chromium.org Reported-by:: Aleksander Morgado Fixes: 339f83612f3a ("usb: cdc-wdm: close race between read and workqueue") Cc: stable Cc: Oliver Neukum Cc: Bjørn Mork Signed-off-by: Greg Kroah-Hartman --- drivers/usb/class/cdc-wdm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -485,7 +485,6 @@ out_free_mem: static int service_outstanding_interrupt(struct wdm_device *desc) { int rv = 0; - int used; /* submit read urb only if the device is waiting for it */ if (!desc->resp_count || !--desc->resp_count) @@ -500,10 +499,7 @@ static int service_outstanding_interrupt goto out; } - used = test_and_set_bit(WDM_RESPONDING, &desc->flags); - if (used) - goto out; - + set_bit(WDM_RESPONDING, &desc->flags); spin_unlock_irq(&desc->iuspin); rv = usb_submit_urb(desc->response, GFP_KERNEL); spin_lock_irq(&desc->iuspin);