Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2213405imm; Thu, 7 Jun 2018 07:10:30 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIISwYn+cEyCbLI4uOBSGEwKF1YyrcMIj9F+UyfIakBGoGngCZUVNpHLZcTliVjjGHTtRCJ X-Received: by 2002:a17:902:d88c:: with SMTP id b12-v6mr1078604plz.361.1528380630185; Thu, 07 Jun 2018 07:10:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528380630; cv=none; d=google.com; s=arc-20160816; b=ViBSS7hxQOz3tb5I5CS9TeCnHKlrlBpoaN3Pwp/uBZxqVw/x7Um2feBU4q/+vxQKGY fXxsA+ua2wzwEr+3HRVXdyY2VzX+VzieHcvoeO8WWuqTUHk451QAaj5NAldULBOjFogi yJqotPUMWFDeNHdtQsQDIkYk6KUPp6R/KZyQ9GMDifEMnamFeJ7mPADpREIyMKAEFAz8 OIANCYovrOktSrIItuSShlVVPS/R62+iC8wrpXtKnpM4Lm/v/npyYxnMIgGnopjqsSj+ 0HHGJInR0/C9yryZKIxOWEsViLEDDcsPbQmO5nFCTmPJPd0Gq2KuQTXQr8NPcjIWiZ/L 7oow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=m2vest65zjg577273+N4kLsMrAp6solbN18+rl2MUsU=; b=XA/F4YNrGAqHwm/z56qTltZ4LpBlSqqIifA5W/pUcmf3tVZ8vuAAOzgjPddvyKuuyd 6heLyjyHxDlcISb8DFsXRv5/O2gfL5CtZN+WBmpT1Ugzd/sm75ZG8gyTXyEmFrz8i8bt xsr9kGc9MuKqeQvfPgu3pT4+3cGYQQdGWgDYJJgIKqVoH4G6Gx4yC4BWU4GNsp78mLSh Te8lW/OnincQi5Thy94G/vdhYN4yVkrkm6eR95/yNl54cChq0wSknYO/X27Lw6P5jsO5 KgazHXIs0DqG465cLlNQkskg267q/VN0c5C0Ti3BEufN+e3XpQ2ZYoUDKq7bxgi98UsD R1jg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j27-v6si27071142pgn.450.2018.06.07.07.10.16; Thu, 07 Jun 2018 07:10:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933111AbeFGOJV (ORCPT + 99 others); Thu, 7 Jun 2018 10:09:21 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:39241 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933007AbeFGOJE (ORCPT ); Thu, 7 Jun 2018 10:09:04 -0400 Received: from [148.252.241.226] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1fQvb4-0005Zw-CX; Thu, 07 Jun 2018 15:09:02 +0100 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1fQvb0-0002o0-PA; Thu, 07 Jun 2018 15:08:58 +0100 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Jia-Ju Bai" , "Johan Hovold" Date: Thu, 07 Jun 2018 15:05:21 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 084/410] USB: serial: io_edgeport: fix possible sleep-in-atomic In-Reply-To: X-SA-Exim-Connect-IP: 148.252.241.226 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.57-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Jia-Ju Bai commit c7b8f77872c73f69a16528a9eb87afefcccdc18b upstream. According to drivers/usb/serial/io_edgeport.c, the driver may sleep under a spinlock. The function call path is: edge_bulk_in_callback (acquire the spinlock) process_rcvd_data process_rcvd_status change_port_settings send_iosp_ext_cmd write_cmd_usb usb_kill_urb --> may sleep To fix it, the redundant usb_kill_urb() is removed from the error path after usb_submit_urb() fails. This possible bug is found by my static analysis tool (DSAC) and checked by my code review. Signed-off-by: Jia-Ju Bai Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Johan Hovold Signed-off-by: Ben Hutchings --- drivers/usb/serial/io_edgeport.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c @@ -2219,7 +2219,6 @@ static int write_cmd_usb(struct edgeport /* something went wrong */ dev_err(dev, "%s - usb_submit_urb(write command) failed, status = %d\n", __func__, status); - usb_kill_urb(urb); usb_free_urb(urb); atomic_dec(&CmdUrbs); return status;