]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
lib/string_helpers: fix not adding strarray to device's resource list
authorPuyou Lu <puyou.lu@gmail.com>
Fri, 13 May 2022 03:38:36 +0000 (20:38 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jun 2022 08:26:25 +0000 (10:26 +0200)
commit cd290a9839cee2f6641558877e707bd373c8f6f1 upstream.

Add allocated strarray to device's resource list. This is a must to
automatically release strarray when the device disappears.

Without this fix we have a memory leak in the few drivers which use
devm_kasprintf_strarray().

Link: https://lkml.kernel.org/r/20220506044409.30066-1-puyou.lu@gmail.com
Link: https://lkml.kernel.org/r/20220506073623.2679-1-puyou.lu@gmail.com
Fixes: acdb89b6c87a ("lib/string_helpers: Introduce managed variant of kasprintf_strarray()")
Signed-off-by: Puyou Lu <puyou.lu@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
lib/string_helpers.c

index 90f9f1b7afecd5bedd909dde28522cf20fa84d35..d6a4e2b84ddba35b1b3db8f4e923739eac3c3cbb 100644 (file)
@@ -757,6 +757,9 @@ char **devm_kasprintf_strarray(struct device *dev, const char *prefix, size_t n)
                return ERR_PTR(-ENOMEM);
        }
 
+       ptr->n = n;
+       devres_add(dev, ptr);
+
        return ptr->array;
 }
 EXPORT_SYMBOL_GPL(devm_kasprintf_strarray);