From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10523C352BE for ; Thu, 16 Apr 2020 13:01:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D97F2206B9 for ; Thu, 16 Apr 2020 13:01:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587042091; bh=UOhYKZo3KQr2O83LtIwsPLZmHV/P5wy9W7Ihm7anBtc=; h=Subject:To:From:Date:List-ID:From; b=VZwuUXIHgq89krO9fsmArZdUa2LyV2EsAZ6kDl1Vr9Kx0eUTpSwif0ig7Y8dg50x/ 2Hs0wsoYZJfz9ftHBzJkGQM/JTf/pxQ0guFjao1GKEFBN9F6avECUZcjLUcW9TzWv8 vkOH4eyMCr7wptzGDomgxR1d7dk3bSKEf4avoANw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2894531AbgDPNBV (ORCPT ); Thu, 16 Apr 2020 09:01:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:38374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2894700AbgDPNBM (ORCPT ); Thu, 16 Apr 2020 09:01:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BDDFA206B9; Thu, 16 Apr 2020 13:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587042072; bh=UOhYKZo3KQr2O83LtIwsPLZmHV/P5wy9W7Ihm7anBtc=; h=Subject:To:From:Date:From; b=lU7GW9G0boqeO61GzCGz8VwrrcRvHzQR708TOqdkTJ8Tr0IAWYVXZA7lQFRAy6OPj jUthkU/+Jv9OjlFopRDMzYHnJToxeUbNvs+7LNpGhx3L56665EduT2e58OsjNT1j/L /eBtIHTbdNFHdaxwLUVEUPpm5GtAqfPwjlo3zMLI= Subject: patch "cdc-acm: close race betrween suspend() and acm_softint" added to usb-linus To: oneukum@suse.com, gregkh@linuxfoundation.org, jonas.karlsson@actia.se, stable@vger.kernel.org From: Date: Thu, 16 Apr 2020 15:01:02 +0200 Message-ID: <158704206253248@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled cdc-acm: close race betrween suspend() and acm_softint to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 0afccd7601514c4b83d8cc58c740089cc447051d Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Wed, 15 Apr 2020 17:13:57 +0200 Subject: cdc-acm: close race betrween suspend() and acm_softint Suspend increments a counter, then kills the URBs, then kills the scheduled work. The scheduled work, however, may reschedule the URBs. Fix this by having the work check the counter. Signed-off-by: Oliver Neukum Cc: stable Tested-by: Jonas Karlsson Link: https://lore.kernel.org/r/20200415151358.32664-1-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/class/cdc-acm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 84d6f7df09a4..4ef68e6671aa 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -557,14 +557,14 @@ static void acm_softint(struct work_struct *work) struct acm *acm = container_of(work, struct acm, work); if (test_bit(EVENT_RX_STALL, &acm->flags)) { - if (!(usb_autopm_get_interface(acm->data))) { + smp_mb(); /* against acm_suspend() */ + if (!acm->susp_count) { for (i = 0; i < acm->rx_buflimit; i++) usb_kill_urb(acm->read_urbs[i]); usb_clear_halt(acm->dev, acm->in); acm_submit_read_urbs(acm, GFP_KERNEL); - usb_autopm_put_interface(acm->data); + clear_bit(EVENT_RX_STALL, &acm->flags); } - clear_bit(EVENT_RX_STALL, &acm->flags); } if (test_and_clear_bit(EVENT_TTY_WAKEUP, &acm->flags)) -- 2.26.1