From patchwork Fri Jun 11 10:23:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 458503 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp642273jae; Fri, 11 Jun 2021 03:24:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPlZMhG6BccRsRwZ96kO887/YgNnL1ke/OOBqQEUXQYJiBpr4bJyb12hqWX7udcAE/fyoF X-Received: by 2002:aa7:d602:: with SMTP id c2mr2927615edr.317.1623407081198; Fri, 11 Jun 2021 03:24:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623407081; cv=none; d=google.com; s=arc-20160816; b=FoSaesrUkddmxpftqNhWKgg6UyiLCvA9R91ThpqTtisTzKuGD8hAeqnktlKVQa5Xvz Snv9jrNIOjZnUhdyYifth4R1ywg2N+Nwx/0XG99TUiWkL2947POuJjZe40Q5gIKtZRap 6OP7aOwXtbBcRtf+PqjGVoP5krr/4FWnkSSweTFV9zOTc1Ftqsz4PUsInVHFmUIgnGcu Gne3CfY4/y+a9Y7jAQLiIQ4yaXOQTuCskf4lcIYbbQKwD56sGskengOVj+1medQlXdMY Y/FgJjsdonuyasGIY2ZlIuF5r3a/I4H6Seb2xgwFbosMamID6jLHHqDTSPQeHPXxT+XY u5BA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=2f7/TFgLVrG5lfOiI4zi8HzRCiY/70uX27quxfvnzbY=; b=NpXmr2VzOOwf1267x4rNm7bCrr52nUbtD1UvLfP96zIxxeLBtOZT2j8yGLFNmXPRuo /tGpwvNFN7g1FxhOvUpQZlnLByUIzqZckSpThFd+TZsA7pMl3O3tR3fxfuyNqjkpt+En Zd+iW7TVONmfKqZkL4ADEFhyup2MeKT5Ym7vevTGYcDPZ2RatNRqtGUUhG/0/dhhHToo AcdkmVbJswyis5xoisZf3B5ZdFW6gL5dP7jEEhrMW+OoLANYbVCq00brB2o/myLwNywI S68EmbY4jieGRskUouIXXCguElGC18gxGYzKQraYy4w8jm4LfDITK6gGxzafQp3sjoEB 4uzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jKGxIQHd; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k9si5114474edv.565.2021.06.11.03.24.40; Fri, 11 Jun 2021 03:24:41 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linaro.org header.s=google header.b=jKGxIQHd; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S230349AbhFKK0h (ORCPT + 12 others); Fri, 11 Jun 2021 06:26:37 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:39890 "EHLO mail-wr1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229480AbhFKK0h (ORCPT ); Fri, 11 Jun 2021 06:26:37 -0400 Received: by mail-wr1-f50.google.com with SMTP id l2so5488207wrw.6 for ; Fri, 11 Jun 2021 03:24:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2f7/TFgLVrG5lfOiI4zi8HzRCiY/70uX27quxfvnzbY=; b=jKGxIQHdD6gjIrzQmopPo2aSyn3PhYLolsFqRZP4AnTV1WTgXzPoqql6wnFSyjQgOW popRktZsPNNUJEWKc45RrZ+3bgZKqK3Q42YExWMGLoLi4woqg2eRKMmwsTFlCjXpbdcf CbaVOEzAh7z+36/OnnZ4JJHsZywSCelJz/VZXkaDVGXfByvg8p/OPJP1duYohYQTV4DL bUzL4S9g6bgVSvDn26LNk38/v+RNfiWozQZSPHUmYyCvE9UJmbtF8S6KF1LrJrVkLH8f XkrXeH+7/tVvbSOTx0teONFsJ+608OB4C/FnCnmbSDW+76Ko0nVhzam+SLwmp08sRSd+ xPBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2f7/TFgLVrG5lfOiI4zi8HzRCiY/70uX27quxfvnzbY=; b=q6n72GpRpN+oYpL8UxCHKXi4bvrANXu/Dx5SVAt3d8VZtKFHQKDNHJgDDxg0CU5ftR XkrfZReByt1BMs77d+SmL/sLqdqcqF34iknIvHwQvB2uL8vpaZNKbL/A3zqF0UaaCf68 HtZdghZ37BL/VKTdKokkqYi1qzSHSMgpWIFmffQtqbtJehLoTNS3YPVeeqqdlR9/Z0br w6zXXhJYbVyUs9odcyD9Kxw7VRiCJiSO9hyIflcThMf/+UeTTPHwiaOCeuFDBf3lNr+a KOG8IxDqlgnpMnySsxdTkUbETK9y/6UEk2Nz94cPeLux6SM/SFUJvxP87NdgVX25DY5C 6Hcg== X-Gm-Message-State: AOAM5336N8bxGPOuEb/wmrYdfmcA5zylSK7A2OcWNhnNuTkQPcYL/uWq +jkYcHeWO7MBlBWZpn4a6tDL4w== X-Received: by 2002:a5d:47c3:: with SMTP id o3mr3305518wrc.122.1623407007638; Fri, 11 Jun 2021 03:23:27 -0700 (PDT) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id q20sm8317234wrf.45.2021.06.11.03.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 03:23:27 -0700 (PDT) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Christophe JAILLET , stable@vger.kernel.org, Srinivas Kandagatla Subject: [RESEND PATCH] nvmem: core: add a missing of_node_put Date: Fri, 11 Jun 2021 11:23:21 +0100 Message-Id: <20210611102321.11509-1-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe JAILLET 'for_each_child_of_node' performs an of_node_get on each iteration, so a return from the middle of the loop requires an of_node_put. Fixes: e888d445ac33 ("nvmem: resolve cells from DT at registration time") Cc: Signed-off-by: Christophe JAILLET Signed-off-by: Srinivas Kandagatla --- Hi Greg, Resending just this one with cc stable as rest of nvmem series are already applied. thanks, srini drivers/nvmem/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.21.0 diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index b3c28a2d4c10..4868aa876e1b 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -686,15 +686,17 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem) continue; if (len < 2 * sizeof(u32)) { dev_err(dev, "nvmem: invalid reg on %pOF\n", child); + of_node_put(child); return -EINVAL; } cell = kzalloc(sizeof(*cell), GFP_KERNEL); - if (!cell) + if (!cell) { + of_node_put(child); return -ENOMEM; + } cell->nvmem = nvmem; - cell->np = of_node_get(child); cell->offset = be32_to_cpup(addr++); cell->bytes = be32_to_cpup(addr); cell->name = kasprintf(GFP_KERNEL, "%pOFn", child); @@ -715,11 +717,12 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem) cell->name, nvmem->stride); /* Cells already added will be freed later. */ kfree_const(cell->name); - of_node_put(cell->np); kfree(cell); + of_node_put(child); return -EINVAL; } + cell->np = of_node_get(child); nvmem_cell_add(cell); }