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=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 97551CA9EAF for ; Mon, 21 Oct 2019 19:04:06 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6279D2086D for ; Mon, 21 Oct 2019 19:04:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=intel-com.20150623.gappssmtp.com header.i=@intel-com.20150623.gappssmtp.com header.b="SMM8mEPV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6279D2086D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvdimm-bounces@lists.01.org Received: from new-ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id F10681007A2F4; Mon, 21 Oct 2019 12:04:17 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::344; helo=mail-ot1-x344.google.com; envelope-from=dan.j.williams@intel.com; receiver= Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7D70D10077F8D for ; Mon, 21 Oct 2019 07:45:05 -0700 (PDT) Received: by mail-ot1-x344.google.com with SMTP id 21so11162445otj.11 for ; Mon, 21 Oct 2019 07:43:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=FxMjjLmCV5wu1SmNNdDes4wpF04tbh7UfnzG8agpR2I=; b=SMM8mEPV5eIu4/MGnm96tEXoZP/uFIWNabBj+JlhE1PpBLziaE6xkdwXDD3R7SFApE b7CBRP/aIKTqteGouH/nWWkMGLuNkDsJ+38UcnHH9GKzx8ufmkHQ9ndW3044/R5QIWm+ b3oXY6yHKbCMLYaxpGMu50UbVsFyaYeOSPMu6TKt+7IZ9AW907IT8hQhpmtibI7k7IgL hJb/YKf5bOtScYctW3xRu7BheXgJQL90Nl4L8SP5hSkBj6Pw1eFda14kOt4G2Yyk2azO EaNGeuETqvNrnBF6glEtn2nBIA3ykxMyD0bp7KHDqiI83KemtUQhIxRwtFAQcsB5WHXz 4k4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=FxMjjLmCV5wu1SmNNdDes4wpF04tbh7UfnzG8agpR2I=; b=INcVau/BOt5sVNaOndcwPc7kwhDfVDkSuhQqLt3Jq9ksB3Y+8o0EF0mlhrDcd+4HoK tazv7yRM2b8BR005A2oJ36NzsElOh1r9Xnl3wJwZF520hhonaJdnyQh22Rtokl8b4Nz/ QAqSCi9DTQGD+nsrX9dRAvgn2/xhR6m5I2KXX2C0QAovznvvNmTFCtOZRFwDvuhXxCHh Z3gOC70SmGqfqV26Z+VfUX/Hsj3+5Ryfk7XMh9spl2usKDk4FJ25B1h1zFX0hvK68ZXM AFRA9UyKiLpq8Ax1kLz0TmRm8g3g8Q0ECwTD04czfoYA9r4ixaltH22oDbhfyG5nJFYP vLkg== X-Gm-Message-State: APjAAAVubECHAD7YdX1o471zvnkQYkCFy+/uIwaZ3589q/1YwfSG0Jwd s6VjzjmA7gk7Rd4I40+wu4/0dOXasnwk4dfPJJ8lfw== X-Google-Smtp-Source: APXvYqwnfS9nd3wLOGs0D0OfKHD+SBxl97XKF9D56iGQIcLGlwPyed8/yOfLu8En+dOBF5iJpDt1gOXwywtP/o3xkzA= X-Received: by 2002:a9d:7c92:: with SMTP id q18mr19200169otn.363.1571668999984; Mon, 21 Oct 2019 07:43:19 -0700 (PDT) MIME-Version: 1.0 References: <20191018123534.GA6549@mwanda> In-Reply-To: From: Dan Williams Date: Mon, 21 Oct 2019 07:43:10 -0700 Message-ID: Subject: Re: [PATCH] acpi/nfit: unlock on error in scrub_show() To: "Rafael J. Wysocki" Message-ID-Hash: F2QATVUEZCUIBBZ65YRGWU7N4DFZBTSU X-Message-ID-Hash: F2QATVUEZCUIBBZ65YRGWU7N4DFZBTSU X-MailFrom: dan.j.williams@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Dan Carpenter , "Rafael J. Wysocki" , Len Brown , Greg Kroah-Hartman , "linux-nvdimm@lists.01.org" , ACPI Devel Maling List , Linux Kernel Mailing List , kernel-janitors@vger.kernel.org X-Mailman-Version: 3.1.1 Precedence: list List-Id: "Linux-nvdimm developer list." Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Sun, Oct 20, 2019 at 4:35 PM Rafael J. Wysocki wrote: > > On Fri, Oct 18, 2019 at 2:38 PM Dan Carpenter wrote: > > > > 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 > > --- > > drivers/acpi/nfit/core.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c > > index 1413324982f0..14e68f202f81 100644 > > --- a/drivers/acpi/nfit/core.c > > +++ b/drivers/acpi/nfit/core.c > > @@ -1322,7 +1322,7 @@ static ssize_t scrub_show(struct device *dev, > > 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); > > -- > > Applying as a fix for 5.4, thanks! > > @Dan W: Please let me know if you'd rather take it yourself. If you already have it applied, I have no concerns. Acked-by: Dan Williams _______________________________________________ Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org To unsubscribe send an email to linux-nvdimm-leave@lists.01.org