From patchwork Fri Jan 27 10:40:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 49174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp763335wrn; Fri, 27 Jan 2023 02:42:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXs71bU9GHv23b3WNg5JkgoFTNVdFqDutwoGBjUMJahhzeg6uQzNupQJvM1kalfIbMHMeMDY X-Received: by 2002:a05:6a20:d68b:b0:b8:5134:a36b with SMTP id it11-20020a056a20d68b00b000b85134a36bmr43686584pzb.21.1674816124348; Fri, 27 Jan 2023 02:42:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674816124; cv=none; d=google.com; s=arc-20160816; b=bWDnAKFPMowRlMoDu26uPH9lIWBAkJ8WYG4GyID4R3r3HhR35oRAurSv7eqS59q75t Q9obSzzd/hz0PmfiiTOnCuuG2fW9QQaVmTDZjzYJj78si0dfXovQswAnufeghT+laQXK TG53o39+cmE5RogrS1opeA5cVtQeyFsA0MULMwQp+yjM+e2XxdPb3CDJ0w6z4jdExgBO kExwhW9nIo8RZQP9Dzo/WXgOyBHxoGnF0k1mJ6XFYFztQFPHo0PcAC02Uid/2DKdMG7N m47aDchibYkTcuPS9A/NhgegvwkS+isGpjLPDecftkKgaIPw81KvOeB9vl3cqLItjXhS svgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sr6CA9xjZwvud8xzQyK6dmW2Ra23HBqhT3DLj1X0by0=; b=qYeqzbGcuJzPK0atAJ05MrNC6x9pDzL3DfKoIVf8ZF/Kpd8WJSLmotWQmNzrRMQ3/s ykzluDtxw2X8v7hGiOB0gPlz85LQJYqwARkEhggRc9u1aLPuYB23Ye+ArCgazHL/iz1P xa6P59rm+fz9P/nXykdIOPAJeWAMHPMLbkP6T0N9gzNPLbbkFVpqiesUMPJsVtvG3s6r V2ngD+aE+e8JaEEjZPF87Ye7SWq6Ug10b03C22pJKHGg7gpWHpDH1TkVLmCp6KZ0qjN0 TGBVhC4CVG2KkOe0UOuPnYRD7DrfQ2yTWKKG1YvsziGttLeaEAyDMuYubwps+edQ2rF6 RYyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rWfW+A9+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f2-20020a639c02000000b004db2997f585si2071122pge.760.2023.01.27.02.41.51; Fri, 27 Jan 2023 02:42:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rWfW+A9+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232340AbjA0KlA (ORCPT + 99 others); Fri, 27 Jan 2023 05:41:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232041AbjA0Kkk (ORCPT ); Fri, 27 Jan 2023 05:40:40 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 047C11F5EB for ; Fri, 27 Jan 2023 02:40:33 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id f12-20020a7bc8cc000000b003daf6b2f9b9so5099292wml.3 for ; Fri, 27 Jan 2023 02:40:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sr6CA9xjZwvud8xzQyK6dmW2Ra23HBqhT3DLj1X0by0=; b=rWfW+A9+dX4D+Iqs4/ibFCmB7czEciSj0MHxvMw1Tmmmyw5Kc/22/Ocevvr8+ZlUmS CY7oYhz9T5650eWArL6xtD2IM+VJz5FGEg/MsKDQ5OnTyr2nyOe0nu7rSUhLUlgytMAT PrfBnWL90QlVpCPVPv3neli5edKk+ZWj2Xmus07O4IL7LXRMlITk8Tp31Fu+RgYEqprM nPGzcF9MOywEqrEg3F/WFs635W/g/CnO5YhldqA488+ThVoWyCxEBjW/rGjDUf4VN2kE hcKoaD+FwLjW2xn2medwVmGCEpLwuy2PM12ACAfk9/v1kF6PjP9kw8xP3LRSOQ5AYMZ0 vTBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sr6CA9xjZwvud8xzQyK6dmW2Ra23HBqhT3DLj1X0by0=; b=NC5qygAysWUZbDlGaI3goOcL4CREsFmbYXy7jAbt8wA7ZiuOoMe/vSgUToAr5sovdD so8nKKDgAGE6/uBzBgKBzXavlW12DdcL+1pSl4SYZmpae2LXKaCqaMpsgATzEE1pCgQM g9ttiyLBjvlo741HJOhihH3rZvMQv4S4M3RkdAldc4JlN1DFHZ7jv/Hbg8jMaGWbNqRy z69JumnrQe7XCttrGgUCkn4x104GOlvlG2+fGpMyUJnE4GJOctDQumeII73CyVKdas5X BKK0xEGPHyBelkzNsTgnbyIH1AgifAUahiauZUlA1QoJNJ/YrXG38+EnsYwbVSo6kV9c +nMQ== X-Gm-Message-State: AO0yUKV/bioOBNY9uEWi+2Y0PuOXs5S04sYuzpp9h38zmLNcRaTCyDP+ V3N38jcwdUAX6bx62yLdphO9WA== X-Received: by 2002:a05:600c:1e0d:b0:3dc:3f1b:6757 with SMTP id ay13-20020a05600c1e0d00b003dc3f1b6757mr728908wmb.15.1674816031564; Fri, 27 Jan 2023 02:40:31 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:30 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Michael Walle , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 07/10] nvmem: core: fix device node refcounting Date: Fri, 27 Jan 2023 10:40:12 +0000 Message-Id: <20230127104015.23839-8-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756171992227939589?= X-GMAIL-MSGID: =?utf-8?q?1756171992227939589?= From: Michael Walle In of_nvmem_cell_get(), of_get_next_parent() is used on cell_np. This will decrement the refcount on cell_np, but cell_np is still used later in the code. Use of_get_parent() instead and of_node_put() in the appropriate places. Cc: stable@vger.kernel.org Fixes: 69aba7948cbe("nvmem: Add a simple NVMEM framework for consumers") Fixes: 7ae6478b304b ("nvmem: core: rework nvmem cell instance creation") Signed-off-by: Michael Walle Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index e92c6f1aadbb..cbe5df99db82 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1237,16 +1237,21 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, const char *id) if (!cell_np) return ERR_PTR(-ENOENT); - nvmem_np = of_get_next_parent(cell_np); - if (!nvmem_np) + nvmem_np = of_get_parent(cell_np); + if (!nvmem_np) { + of_node_put(cell_np); return ERR_PTR(-EINVAL); + } nvmem = __nvmem_device_get(nvmem_np, device_match_of_node); of_node_put(nvmem_np); - if (IS_ERR(nvmem)) + if (IS_ERR(nvmem)) { + of_node_put(cell_np); return ERR_CAST(nvmem); + } cell_entry = nvmem_find_cell_entry_by_node(nvmem, cell_np); + of_node_put(cell_np); if (!cell_entry) { __nvmem_device_put(nvmem); return ERR_PTR(-ENOENT);