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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 C74E6C2D0DA for ; Fri, 27 Dec 2019 17:41:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F0F92176D for ; Fri, 27 Dec 2019 17:41:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577468464; bh=4IyyrK3rcc20TYIu/QyrdI8yxLZaiEYZrJ/T8FRNMo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TxmOVg2LQH99rbGcvl4kLMz+P5RfNqX+5Tp4m5NPzbMfTDAdQVE347uOX7mAiHyYv dAiApCD4kWu1yaMoMXgfsgnphZ98csYvCu2wefL42xPKxFoYFRPeRdDDM4Jh8AnEce I/F7tEhuTH1z9HUOaT8xHxaUnuqGdoUYCxwEpYMI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727145AbfL0RlD (ORCPT ); Fri, 27 Dec 2019 12:41:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:36914 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726839AbfL0RlB (ORCPT ); Fri, 27 Dec 2019 12:41:01 -0500 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 0D18421582; Fri, 27 Dec 2019 17:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577468460; bh=4IyyrK3rcc20TYIu/QyrdI8yxLZaiEYZrJ/T8FRNMo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PXr8dMh12oCGIdO9JqD5tBKph0gEoM+dO/I+EaDrG13jcksyBU8hb08W9doNdCw90 MQrbpHbBg2V0JqjWJ8EVI+RdR8L4i8pWejEAp1qwDN8l9BLdKX2O4+AgT65E6hVZ0O Md/FwfuioWH1Q94etAHPQ6Z0nkwegkQvNjXBFuaA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wen Yang , Liam Girdwood , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 5.4 003/187] regulator: fix use after free issue Date: Fri, 27 Dec 2019 12:37:51 -0500 Message-Id: <20191227174055.4923-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191227174055.4923-1-sashal@kernel.org> References: <20191227174055.4923-1-sashal@kernel.org> MIME-Version: 1.0 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: Wen Yang [ Upstream commit 4affd79a125ac91e6a53be843ea3960a8fc00cbb ] This is caused by dereferencing 'rdev' after put_device() in the _regulator_get()/_regulator_put() functions. This patch just moves the put_device() down a bit to avoid the issue. Signed-off-by: Wen Yang Cc: Liam Girdwood Cc: Mark Brown Cc: linux-kernel@vger.kernel.org Link: https://lore.kernel.org/r/20191124145835.25999-1-wenyang@linux.alibaba.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/regulator/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index a46be221dbdc..71c1467e1e2e 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1935,8 +1935,8 @@ struct regulator *_regulator_get(struct device *dev, const char *id, regulator = create_regulator(rdev, dev, id); if (regulator == NULL) { regulator = ERR_PTR(-ENOMEM); - put_device(&rdev->dev); module_put(rdev->owner); + put_device(&rdev->dev); return regulator; } @@ -2057,13 +2057,13 @@ static void _regulator_put(struct regulator *regulator) rdev->open_count--; rdev->exclusive = 0; - put_device(&rdev->dev); regulator_unlock(rdev); kfree_const(regulator->supply_name); kfree(regulator); module_put(rdev->owner); + put_device(&rdev->dev); } /** -- 2.20.1