Received: by 10.223.185.116 with SMTP id b49csp1135931wrg; Fri, 23 Feb 2018 12:34:01 -0800 (PST) X-Google-Smtp-Source: AH8x226EsKRCXVcFk0BlMuX/K+Z/erqd2w8rlBSXJDYkyzlS4YgpROHxiqnKqh0seiYCJxxvGJkE X-Received: by 10.99.125.78 with SMTP id m14mr2337763pgn.391.1519418041284; Fri, 23 Feb 2018 12:34:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519418041; cv=none; d=google.com; s=arc-20160816; b=LCwqkWqGzH/d2nrCL2Cub94sLpXe308FoGKYog6jII41Sp+M5YRIUi7eY+ErB8ohD8 SuriAAcdQkIbWDvpIShme+24T30DBSGb3QKofyCskenHEVYykzLSZ6knrlFaJ5kOWYeb Ihpv+MLVHgc1CnuPdvQyOVBqNRABjF4/h28XKJCVFCKn96DN21Usd1+n1SiPiuvK2ReT j0/LTEoYzLGexD8z8CqwhonJQchFUXARMueUoqtotT2xcwb9mBJNY5s9O6diwzZeVybA PoOLujV3J0f01QXqu8pty1hjWBfSW/HBrFWN38Pl4O9+2RlSxpvdYZKFkJ/PMu76+doP 1d6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=CsIW/rsj305XNcIknOIQ3kdqPwKvRlQiSsg2rMNWFpc=; b=P8EUpEjnlsMCuHHzJ6RaM9O6cKoc2WJ3CU4pwe171h9GqFSlMEVKqchFkdN5GdwJQw qf0QC6SZAeGWAlm7K56DLNDlA3li6+pHDx0VMYJt/pen2tuDLGtgnazj8YP7ty0XLecq U7sKU18sSj/J05hobAJxpJnBOd8NffcaosK/KBr2lqRwRun7uVsmamvcUBSwvPbstlxr 7OuG8y/+p6a0E+ybJtt0QGYkV1p835O6Tbfp8t4psV5Xx/GKoflyYqIp74bPpb3vQQuJ et3641cf+o3nQLp4wwjwjOrSlWXQMsv6EExOQSU8Dnj/gMqLKHMKK/N2P2M6vVfW99aW bWWw== 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 w4si1933116pgt.635.2018.02.23.12.33.47; Fri, 23 Feb 2018 12:34:01 -0800 (PST) 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 S1753835AbeBWSfb (ORCPT + 99 others); Fri, 23 Feb 2018 13:35:31 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:37314 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752501AbeBWSf3 (ORCPT ); Fri, 23 Feb 2018 13:35:29 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 743D212A6; Fri, 23 Feb 2018 18:35:28 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jia-Ju Bai , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 061/193] hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close Date: Fri, 23 Feb 2018 19:24:54 +0100 Message-Id: <20180223170335.529445145@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170325.997716448@linuxfoundation.org> References: <20180223170325.997716448@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jia-Ju Bai [ Upstream commit 6e266610eb6553cfb7e7eb5d11914bd01509c406 ] The driver may sleep under a spinlock. The function call path is: rr_close (acquire the spinlock) free_irq --> may sleep To fix it, free_irq is moved to the place without holding the spinlock. This bug is found by my static analysis tool(DSAC) and checked by my code review. Signed-off-by: Jia-Ju Bai Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/hippi/rrunner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/hippi/rrunner.c +++ b/drivers/net/hippi/rrunner.c @@ -1381,8 +1381,8 @@ static int rr_close(struct net_device *d rrpriv->info_dma); rrpriv->info = NULL; - free_irq(pdev->irq, dev); spin_unlock_irqrestore(&rrpriv->lock, flags); + free_irq(pdev->irq, dev); return 0; }