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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 041CDC33C9E for ; Sat, 11 Jan 2020 10:15:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4BE820673 for ; Sat, 11 Jan 2020 10:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737732; bh=FnZPoNBagxvxWxZ/U8zTvEliUMOg4jheX72GYnmXcUg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YlegN04FkH62WpJueKnlwbqki0w92xpmPPxMe+Xsxzik+BaKTZBkj5omkWh6bDoFf 9ITZNul//Ac3RYfvWDC7s13ouMTQZoRRw7hE2blYO+8zuhcUBCBBbTk2qhOHgd0bwX hdPvyQQDjc1h0TYXQoCRR6n0+XZc38YSSNFM1txc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730260AbgAKKPb (ORCPT ); Sat, 11 Jan 2020 05:15:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:56970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730123AbgAKKP0 (ORCPT ); Sat, 11 Jan 2020 05:15:26 -0500 Received: from localhost (unknown [62.119.166.9]) (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 4E2F320673; Sat, 11 Jan 2020 10:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737726; bh=FnZPoNBagxvxWxZ/U8zTvEliUMOg4jheX72GYnmXcUg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xJtPs7xYIQqs80kwdWq7xi4VziYb7kw5WpnvFeo6LjYdNJJEs8IPy59AHXqGQNEMD mfpOsDIBMdiYCtlHD8ixQ6eeNuSbrv9k50/94GseVrpU3erNa2U7pExdnRhrO49ufd V0EZNeP/9veobUI1QPkscVT67RPzkEWFPiV82FBY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wen Yang , Liam Girdwood , Mark Brown , Sasha Levin Subject: [PATCH 4.19 04/84] regulator: fix use after free issue Date: Sat, 11 Jan 2020 10:49:41 +0100 Message-Id: <20200111094846.083565992@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094845.328046411@linuxfoundation.org> References: <20200111094845.328046411@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: 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 f312764660e6..4bab758d14b1 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1724,8 +1724,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; } @@ -1851,13 +1851,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