de8d5b50e2
Removed upstreamed: backport-5.15/807-v6.1-0003-nvmem-core-add-error-handling-for-dev_set_name.patch[1] bcm47xx/patches-5.15/070-net-bgmac-fix-BCM5358-support-by-setting-correct-fla.patch[2] Added fix: backport-5.15/883-0001-net-Remove-WARN_ON_ONCE-sk-sk_forward_alloc-from-sk_.patch[3] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.95&id=14eea6449473c1f55e196cc104ba16d144465869 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.95&id=2603a5ca6223bb3a88814e2728335eec14f715ab 3. https://lore.kernel.org/stable/20230227211548.13923-1-kuniyu@amazon.com Build system: x86_64 Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me>
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From edcf2fb660526b5ed29f93bd17328a2b4835c8b2 Mon Sep 17 00:00:00 2001
|
|
From: Michael Walle <michael@walle.cc>
|
|
Date: Fri, 27 Jan 2023 10:40:12 +0000
|
|
Subject: [PATCH] nvmem: core: fix device node refcounting
|
|
|
|
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.
|
|
|
|
Fixes: 69aba7948cbe ("nvmem: Add a simple NVMEM framework for consumers")
|
|
Fixes: 7ae6478b304b ("nvmem: core: rework nvmem cell instance creation")
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: Michael Walle <michael@walle.cc>
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
Link: https://lore.kernel.org/r/20230127104015.23839-8-srinivas.kandagatla@linaro.org
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/nvmem/core.c | 11 ++++++++---
|
|
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/nvmem/core.c
|
|
+++ b/drivers/nvmem/core.c
|
|
@@ -1237,16 +1237,21 @@ struct nvmem_cell *of_nvmem_cell_get(str
|
|
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);
|