Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2255246ybg; Sun, 27 Oct 2019 14:30:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqx/hkjQqRxN6Lh6iCfGwiVKhQmW3ERZlybi49dnC4fu9zIthJwIpJp4wiPYJDWaqD5ldxh2 X-Received: by 2002:a05:6402:891:: with SMTP id e17mr15549346edy.236.1572211822857; Sun, 27 Oct 2019 14:30:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211822; cv=none; d=google.com; s=arc-20160816; b=yqHMf8U0t593OTaPLeHw/cjxdgO9a8A3p2pLvgzf8FyOviDJ0Urnx3vSTkfW4FvWwT s5zfp1P8IOOK0fGAIWTz2UQITcHNrH1EcMYL5n1QnLhuFaohWi9xep3IDIL6q4+1vF4B O11Z8Dg4gx5hrRr3tA1Tj6wpWMEkhYivreFz9rKsMHbPOgT90WfkBdM40Bnx2aZ2a/0k uZxyhnckxM89a8oCk9T/bZYe5NAXvYjREPbvrSomWy9F0uuqXniQuWmtm1eVNkfqVxv9 bDFz9ZCgpvNSScJ3EUdI7yAbta9YEXG3gKul8Sui9txILNqQi436P32leG86oS8ozPnI 8B2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=j+iV8oUob5W1ZcX2Og0BRxoSPpR+8WJq3jJZ35PI16Y=; b=ORhdsBd3XjHv1xojs+0xgPNvnO6oBxaer4BnpHdQgml7r9ZlKhTjf+ITjbPh1bAbDk n/dZJkDhUi9NQrkrw4ojN4prirkkZVdiOTnMbX7Zfm+RGwnqYDJ5zjFHA9FJ0OZDccoh 2vrWmo8xsNerJ/kSLbXW3dobGWy9btuCo6zpqU4aeI/hTUf0v7JbvdXqtjo+p8kyuTNX mKgMeRmvIUosq+xsg3eiJyK6ux86kTMuZQUORf8QVNPFxO+axiVbFGe6jUgUZtOMK5Xm Q2FM8chp75p5Vae0exVfxtw8N2q/IE0aLXbjoGMctMAwi5YB4bdCr0Y2GE+n+Clt3kih SGAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KTFkLkUa; 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 p6si4922992ejl.205.2019.10.27.14.29.59; Sun, 27 Oct 2019 14:30:22 -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; dkim=pass header.i=@kernel.org header.s=default header.b=KTFkLkUa; 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 S1732175AbfJ0VWd (ORCPT + 99 others); Sun, 27 Oct 2019 17:22:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:43610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731496AbfJ0VWc (ORCPT ); Sun, 27 Oct 2019 17:22:32 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 C3F45205C9; Sun, 27 Oct 2019 21:22:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211352; bh=E2dLrKShCGptKM9yTrlBFPaj+LfW1k7X97ub5bP3gr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KTFkLkUaddmIGpRH9gUBYw1BrocNKfQRHnstC4lfkUGTZjoksjTISaRNEvHmPlZHu MHw+sGMphzosXIfFYqc3oPvT1sUyyXpuR0W3+KQeV5SSPDyzO2plVq0vpJrW2QhfTx NCgFl6hAyZLJGQ+w4pygNrDl5rmYasDCaJuPg1tk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Ira Weiny , Dan Williams , "Rafael J. Wysocki" Subject: [PATCH 5.3 120/197] ACPI: NFIT: Fix unlock on error in scrub_show() Date: Sun, 27 Oct 2019 22:00:38 +0100 Message-Id: <20191027203358.213846715@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter commit edffc70f505abdab885f4b4212438b4298dec78f upstream. We change the locking in this function and forgot to update this error path so we are accidentally still holding the "dev->lockdep_mutex". Fixes: 87a30e1f05d7 ("driver-core, libnvdimm: Let device subsystems add local lockdep coverage") Signed-off-by: Dan Carpenter Reviewed-by: Ira Weiny Acked-by: Dan Williams Cc: 5.3+ # 5.3+ Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/nfit/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -1322,7 +1322,7 @@ static ssize_t scrub_show(struct device nfit_device_lock(dev); nd_desc = dev_get_drvdata(dev); if (!nd_desc) { - device_unlock(dev); + nfit_device_unlock(dev); return rc; } acpi_desc = to_acpi_desc(nd_desc);