Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3091094ybt; Mon, 29 Jun 2020 15:07:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBQ72vZrtOSx6bdYk+GnR8/YLUhQtjqEen/gAnHommHYw2Wbj02MzgVQuqaV9CpaBVQ47g X-Received: by 2002:a17:906:b292:: with SMTP id q18mr16368756ejz.253.1593468447351; Mon, 29 Jun 2020 15:07:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468447; cv=none; d=google.com; s=arc-20160816; b=prumgPtpZaGTViQIIffRzk/JFj7CWcy81HsZqr0VyU9UJ//mIGFDmRCnrVqUPusoUg mDOKABpbzbUqAUPhUI/eTzwVUxf9K/qjWzmfWVa1/mqL8lEOov4aj3oESnihC3tQD1kT paoVoa888iQasVwMs757Ny0Qyfc8/hXW0TReGPiun32+tcoicUEGpp3iNCkSZRMe4rUi qkZpGZbxW5z+SjfsRA/cM0rrI2FjWqrdCpYhYv5Bu81U1ibD7rB+wDyagCv0z8LoJLTv RDYz4TUeLuL9rnYCi9J2P0xQ/77ti3xuZFzCArstn40SWzRrWX2nUcObv1X5s+hKBMWV PU7w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=n5X8dTHQmFTFxLJFKEs/kpvlEoh+B//L6LMR2WeUbdc=; b=Pp/zbpppcIyRsyf4cbEuZTd32ycWy4zuoZx2dOp4qbu9AtZ+kujEhppLx91JaDKD83 38u36+EOnbIlQudK7TWapks+3WZdJEkOr7XMaN3gtapIr1V1cT/P/gJqaakKktP4e5gX gNy/VqBxLAsQuRbGkVr5M3cwhcYvYQDLY7VMyKT457Q0nHh8Nt1M0CbS1TyY5PRmfq72 uIpOwDlWEuxFi9/8Dsxflp5MK40HC2r3n7pcN8ZDbzk+U4nItjvtA8t3/2/gosl1Jmkw pGoa7gn4J3wAqFl3Lk8JVBxHGa4uthA++7idPXSE1VJwQTxRPBSDia05IyE3M164r44E 2veA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HPq7tQrK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b15si481345edx.0.2020.06.29.15.07.04; Mon, 29 Jun 2020 15:07:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HPq7tQrK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730524AbgF2WGG (ORCPT + 99 others); Mon, 29 Jun 2020 18:06:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:56764 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726145AbgF2SfT (ORCPT ); Mon, 29 Jun 2020 14:35:19 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 113D724755; Mon, 29 Jun 2020 15:21:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444073; bh=rddvpDfFVekss7/Pg3s+lxXRzrKvxWRTL8sw+yvTBNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HPq7tQrKCGW5yJxmBMB1C6Qy3oDphoP7efwrKigsqu/Q80VdUW8bwTy/8qz4HLaJ6 /DStQaXbwRFUi1hyyqfdYC2p9FHrFelCdUEZ2p9832so7GUupQiM6D02jndZS3yd7X A4WH/qwHrQ4zvOMDy9diT7R4DNcaqZ6NkXsjpxhU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Navid Emamdoost , Jens Axboe , Sasha Levin Subject: [PATCH 5.7 182/265] sata_rcar: handle pm_runtime_get_sync failure cases Date: Mon, 29 Jun 2020 11:16:55 -0400 Message-Id: <20200629151818.2493727-183-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Navid Emamdoost [ Upstream commit eea1238867205b9e48a67c1a63219529a73c46fd ] Calling pm_runtime_get_sync increments the counter even in case of failure, causing incorrect ref count. Call pm_runtime_put if pm_runtime_get_sync fails. Signed-off-by: Navid Emamdoost Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/ata/sata_rcar.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c index 980aacdbcf3b4..141ac600b64c8 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -907,7 +907,7 @@ static int sata_rcar_probe(struct platform_device *pdev) pm_runtime_enable(dev); ret = pm_runtime_get_sync(dev); if (ret < 0) - goto err_pm_disable; + goto err_pm_put; host = ata_host_alloc(dev, 1); if (!host) { @@ -937,7 +937,6 @@ static int sata_rcar_probe(struct platform_device *pdev) err_pm_put: pm_runtime_put(dev); -err_pm_disable: pm_runtime_disable(dev); return ret; } @@ -991,8 +990,10 @@ static int sata_rcar_resume(struct device *dev) int ret; ret = pm_runtime_get_sync(dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put(dev); return ret; + } if (priv->type == RCAR_GEN3_SATA) { sata_rcar_init_module(priv); @@ -1017,8 +1018,10 @@ static int sata_rcar_restore(struct device *dev) int ret; ret = pm_runtime_get_sync(dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put(dev); return ret; + } sata_rcar_setup_port(host); -- 2.25.1