lib/string_helpers: Introduce parse_int_array()

Existing parse_inte_array_user() works with __user buffers only.
Separate array parsing from __user bits so the functionality can be
utilized with kernel buffers too.

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20250404090337.3564117-2-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h
index e93fbb5b0c01f07867f84febeb594798c3c495f4..3fb88a1e989833ad5ea1a46858efa16e3971bf08 100644 (file)
--- a/include/linux/string_helpers.h
+++ b/include/linux/string_helpers.h
@@ -31,6 +31,7 @@ enum string_size_units {
 int string_get_size(u64 size, u64 blk_size, const enum string_size_units units,
                    char *buf, int len);
 
+int parse_int_array(const char *buf, size_t count, int **array);
 int parse_int_array_user(const char __user *from, size_t count, int **array);
 
 #define UNESCAPE_SPACE         BIT(0)

diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 91fa37b5c510a7f2a53bd0fe8518d672790c1ff9..ffb8ead6d4cd27b9b34b81a537dc8a0ef5633438 100644 (file)
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -138,6 +138,25 @@ int string_get_size(u64 size, u64 blk_size, const enum string_size_units units,
 }
 EXPORT_SYMBOL(string_get_size);
 
+int parse_int_array(const char *buf, size_t count, int **array)
+{
+       int *ints, nints;
+
+       get_options(buf, 0, &nints);
+       if (!nints)
+               return -ENOENT;
+
+       ints = kcalloc(nints + 1, sizeof(*ints), GFP_KERNEL);
+       if (!ints)
+               return -ENOMEM;
+
+       get_options(buf, nints + 1, ints);
+       *array = ints;
+
+       return 0;
+}
+EXPORT_SYMBOL(parse_int_array);
+
 /**
  * parse_int_array_user - Split string into a sequence of integers
  * @from:      The user space buffer to read from
@@ -153,30 +172,14 @@ EXPORT_SYMBOL(string_get_size);
  */
 int parse_int_array_user(const char __user *from, size_t count, int **array)
 {
-       int *ints, nints;
        char *buf;
-       int ret = 0;
+       int ret;
 
        buf = memdup_user_nul(from, count);
        if (IS_ERR(buf))
                return PTR_ERR(buf);
 
-       get_options(buf, 0, &nints);
-       if (!nints) {
-               ret = -ENOENT;
-               goto free_buf;
-       }
-
-       ints = kcalloc(nints + 1, sizeof(*ints), GFP_KERNEL);
-       if (!ints) {
-               ret = -ENOMEM;
-               goto free_buf;
-       }
-
-       get_options(buf, nints + 1, ints);
-       *array = ints;
-
-free_buf:
+       ret = parse_int_array(buf, count, array);
        kfree(buf);
        return ret;
 }