From patchwork Fri Nov 13 00:20:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 11902323 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=-8.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 470F4C5519F for ; Fri, 13 Nov 2020 00:21:10 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 AFFE122252 for ; Fri, 13 Nov 2020 00:21:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YlOQwFb5"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="P4toRVJh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AFFE122252 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=rere.qmqm.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:MIME-Version:Subject:From:References:In-Reply-To: Message-Id:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fyeqUq9gXkRgDCYxBZbsITeqXLIBVFrgpPng6/bT/B0=; b=YlOQwFb5poack7m99GM5uYR1b poylLvc3GYAnxWTCE0fmXiQFkRHoPxY+XEnmpktL0jTmqm88E47fgIMwD43GS1iUQ0HnwiyFrK1ta Fkhu2vVjEKS9ZnM34G+zA/nUTxEvcWAFdE5mIX1FvhD8aN4pFKi9rbcVB2fFOSv7hzdpY+BDEd2hf 3JQl7+0IqnROxAC2JaOfCrmQiAiSSuR+HJMCKXjga//Y7jz14D1mQks6DQHSFY8EeRuGbrgw/HbTw gRZBPFrWrXwaQCb8gxSOxS3w4QUDhn6TAaRDZHebNYRIdXhsqJJ50yfyGDiusKM2SPP0BXY2PQNqp Ms3HSEHyg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdMpa-0001X8-AY; Fri, 13 Nov 2020 00:20:46 +0000 Received: from rere.qmqm.pl ([91.227.64.183]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdMpM-0001T7-Ld for linux-arm-kernel@lists.infradead.org; Fri, 13 Nov 2020 00:20:35 +0000 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4CXJyh3sdQzPG; Fri, 13 Nov 2020 01:20:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1605226828; bh=v/N+ke/pAmzjcPwPxtjEP2gk5NrcB9U2EpCsm2ZUup4=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=P4toRVJhjTSlN3ZbQf15Vjex+ZCE/OjDa1oHj/A3Lm1pH+vfcU971wCUB5E2nBVSM ZMjFG1CjHLAFCQifOItDmuRN8G+2+tHwQFMukVmWiWPkFPmmswG1913YLtWUL4Vl3Z bV4va4iW6y/j7NQHQKIgYQ/B2NneucgucD8o9nqcHEfHVXUXDqd/TbZMwuWSuiIi3y jr0tD7vW1nuTXmyyUvy4FJvEcZU6kuCPlluCFC2ZNtXZgVgus54JLdKKgHdiqF7Oiz wPDTmBGX7DxgRAz9UEGnceWICqHu0BhnLI8C7Nv+gEB2hCt0hNvT7/ZNOSl1+VxfjA rGVK5KYDIprdw== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.102.4 at mail Date: Fri, 13 Nov 2020 01:20:28 +0100 Message-Id: In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH RESEND 3/4] regulator: avoid resolve_supply() infinite recursion MIME-Version: 1.0 To: Liam Girdwood , Mark Brown X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201112_192032_923097_31341B4C X-CRM114-Status: GOOD ( 12.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When a regulator's name equals its supply's name the regulator_resolve_supply() recurses indefinitely. Add a check so that debugging the problem is easier. The "fixed" commit just exposed the problem. Fixes: aea6cb99703e ("regulator: resolve supply after creating regulator") Cc: stable@vger.kernel.org Reported-by: Ahmad Fatoum Signed-off-by: Michał Mirosław --- drivers/regulator/core.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index ad36f03d7ee6..ab922ed273f3 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1841,6 +1841,12 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) } } + if (r == rdev) { + dev_err(dev, "Supply for %s (%s) resolved to itself\n", + rdev->desc->name, rdev->supply_name); + return -EINVAL; + } + /* * If the supply's parent device is not the same as the * regulator's parent device, then ensure the parent device