From nobody Mon Apr 6 20:06:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 965DCECAAD4 for ; Sun, 4 Sep 2022 10:19:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233860AbiIDKTL (ORCPT ); Sun, 4 Sep 2022 06:19:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229569AbiIDKTG (ORCPT ); Sun, 4 Sep 2022 06:19:06 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2595F4598D for ; Sun, 4 Sep 2022 03:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662286745; x=1693822745; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qwD2MnFCCPaeWqxY3gsH7fYiNvcGic+bi1IDybKnebc=; b=OzOU7cyI61tIAZ3eyyyvkqaILeZG/pK1zVRvDRFLmF/+WdFPrquSdGyn t9N6Z0PvbuFdTNGpp+8LotcGnzrvffbgvGQqzjUMWqB0CJMgEuc/evo+b EqKzN0DpDJCiL2MdDus3AxP6P6gaRvEIFXRgdR0K3W13jcxm0wIhnuS2c MG/yxx2TkJZU3OOt7ZjvI077W1PyVj/KsOA8jPDMu5gY/c+NFrCYPAOuq Z6ypDOcl0ZW1bYHUtDrt0ll466DebOFWT/U5/NXqkZFtGa6uBVfpoGZP8 lDTQB0jnM6i8u7hfNgl78YBPR8x2dDYJNj4e6JxjyknNRDX2THgkny4gN A==; X-IronPort-AV: E=McAfee;i="6500,9779,10459"; a="382529100" X-IronPort-AV: E=Sophos;i="5.93,289,1654585200"; d="scan'208";a="382529100" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2022 03:19:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,289,1654585200"; d="scan'208";a="646589511" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by orsmga001.jf.intel.com with ESMTP; 04 Sep 2022 03:19:00 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Cc: tiwai@suse.com, perex@perex.cz, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, lgirdwood@gmail.com, kai.vehmanen@linux.intel.com, peter.ujfalusi@linux.intel.com, ranjani.sridharan@linux.intel.com, yung-chuan.liao@linux.intel.com, willy@infradead.org, linux-kernel@vger.kernel.org, andy@kernel.org, intel-poland@eclists.intel.com, andy.shevchenko@gmail.com, Cezary Rojewski Subject: [PATCH v6 1/2] lib/string_helpers: Introduce parse_int_array_user() Date: Sun, 4 Sep 2022 12:28:39 +0200 Message-Id: <20220904102840.862395-2-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220904102840.862395-1-cezary.rojewski@intel.com> References: <20220904102840.862395-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add new helper function to allow for splitting specified user string into a sequence of integers. Internally it makes use of get_options() so the returned sequence contains the integers extracted plus an additional element that begins the sequence and specifies the integers count. Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: Cezary Rojewski --- include/linux/string_helpers.h | 2 ++ lib/string_helpers.c | 44 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h index 4d72258d42fd..dc2e726fd820 100644 --- a/include/linux/string_helpers.h +++ b/include/linux/string_helpers.h @@ -21,6 +21,8 @@ enum string_size_units { void string_get_size(u64 size, u64 blk_size, enum string_size_units units, char *buf, int len); =20 +int parse_int_array_user(const char __user *from, size_t count, int **arra= y); + #define UNESCAPE_SPACE BIT(0) #define UNESCAPE_OCTAL BIT(1) #define UNESCAPE_HEX BIT(2) diff --git a/lib/string_helpers.c b/lib/string_helpers.c index 5ed3beb066e6..230020a2e076 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c @@ -131,6 +131,50 @@ void string_get_size(u64 size, u64 blk_size, const enu= m string_size_units units, } EXPORT_SYMBOL(string_get_size); =20 +/** + * parse_int_array_user - Split string into a sequence of integers + * @from: The user space buffer to read from + * @count: The maximum number of bytes to read + * @array: Returned pointer to sequence of integers + * + * On success @array is allocated and initialized with a sequence of + * integers extracted from the @from plus an additional element that + * begins the sequence and specifies the integers count. + * + * Caller takes responsibility for freeing @array when it is no longer + * needed. + */ +int parse_int_array_user(const char __user *from, size_t count, int **arra= y) +{ + int *ints, nints; + char *buf; + int ret =3D 0; + + buf =3D memdup_user_nul(from, count); + if (IS_ERR(buf)) + return PTR_ERR(buf); + + get_options(buf, 0, &nints); + if (!nints) { + ret =3D -ENOENT; + goto free_buf; + } + + ints =3D kcalloc(nints + 1, sizeof(*ints), GFP_KERNEL); + if (!ints) { + ret =3D -ENOMEM; + goto free_buf; + } + + get_options(buf, nints + 1, ints); + *array =3D ints; + +free_buf: + kfree(buf); + return ret; +} +EXPORT_SYMBOL(parse_int_array_user); + static bool unescape_space(char **src, char **dst) { char *p =3D *dst, *q =3D *src; --=20 2.25.1 From nobody Mon Apr 6 20:06:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08E90ECAAD4 for ; Sun, 4 Sep 2022 10:19:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233614AbiIDKTQ (ORCPT ); Sun, 4 Sep 2022 06:19:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233841AbiIDKTK (ORCPT ); Sun, 4 Sep 2022 06:19:10 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BB3E459A0 for ; Sun, 4 Sep 2022 03:19:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662286749; x=1693822749; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lnKCUE+vkLKFfiJr2fTl5TOkcnCtgN+0ikZDQvPTbT8=; b=nGGq1DPD/L+FsGE1sBX9CCV3lHXSfmSAIgAJOi9Fz0zSc6PRNJi5ixKu F3sppr/zyfuiGEdU/yqx4hRe/q8ZbKPj+WbivPFkw7ocrc/3CqDTaKzBZ r6Lg4qSNL8A5PR4XS926gtKTEbxPuMYxcQhY4lhI+uH1P247w2+jckBuq nD2H3234cNisO5vt8foDflStUrSbiaE/khmQE9z3KVV+9I8eVOrITPLh/ pzyieODyAz9gnodPhlFQVD3Q6WdSBY0Q2qRNHggzAMVqA93YqL4xlpjaJ hEr8bO5RXh2yNdjJNJHutvh5wE2dN4WtTIWiXsf3s32SLalQ4MJVlQZTj g==; X-IronPort-AV: E=McAfee;i="6500,9779,10459"; a="382529103" X-IronPort-AV: E=Sophos;i="5.93,289,1654585200"; d="scan'208";a="382529103" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2022 03:19:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,289,1654585200"; d="scan'208";a="646589526" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by orsmga001.jf.intel.com with ESMTP; 04 Sep 2022 03:19:05 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Cc: tiwai@suse.com, perex@perex.cz, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, lgirdwood@gmail.com, kai.vehmanen@linux.intel.com, peter.ujfalusi@linux.intel.com, ranjani.sridharan@linux.intel.com, yung-chuan.liao@linux.intel.com, willy@infradead.org, linux-kernel@vger.kernel.org, andy@kernel.org, intel-poland@eclists.intel.com, andy.shevchenko@gmail.com, Cezary Rojewski Subject: [PATCH v6 2/2] ASoC: SOF: Remove strsplit_u32() and tokenize_input() Date: Sun, 4 Sep 2022 12:28:40 +0200 Message-Id: <20220904102840.862395-3-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220904102840.862395-1-cezary.rojewski@intel.com> References: <20220904102840.862395-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Make use of global integer-array parsing helper instead of the internal one as both serve same purpose. With that, both strsplit_u32() and tokenize_input() become unused so remove them. Reviewed-by: Andy Shevchenko Signed-off-by: Cezary Rojewski --- sound/soc/sof/sof-client-probes.c | 104 +++++------------------------- 1 file changed, 15 insertions(+), 89 deletions(-) diff --git a/sound/soc/sof/sof-client-probes.c b/sound/soc/sof/sof-client-p= robes.c index eb246b823461..ddeabbb5580e 100644 --- a/sound/soc/sof/sof-client-probes.c +++ b/sound/soc/sof/sof-client-probes.c @@ -12,6 +12,8 @@ #include #include #include +#include + #include #include #include "sof-client.h" @@ -410,79 +412,6 @@ static const struct snd_compress_ops sof_probes_compre= ssed_ops =3D { .copy =3D sof_probes_compr_copy, }; =20 -/** - * strsplit_u32 - Split string into sequence of u32 tokens - * @buf: String to split into tokens. - * @delim: String containing delimiter characters. - * @tkns: Returned u32 sequence pointer. - * @num_tkns: Returned number of tokens obtained. - */ -static int strsplit_u32(char *buf, const char *delim, u32 **tkns, size_t *= num_tkns) -{ - char *s; - u32 *data, *tmp; - size_t count =3D 0; - size_t cap =3D 32; - int ret =3D 0; - - *tkns =3D NULL; - *num_tkns =3D 0; - data =3D kcalloc(cap, sizeof(*data), GFP_KERNEL); - if (!data) - return -ENOMEM; - - while ((s =3D strsep(&buf, delim)) !=3D NULL) { - ret =3D kstrtouint(s, 0, data + count); - if (ret) - goto exit; - if (++count >=3D cap) { - cap *=3D 2; - tmp =3D krealloc(data, cap * sizeof(*data), GFP_KERNEL); - if (!tmp) { - ret =3D -ENOMEM; - goto exit; - } - data =3D tmp; - } - } - - if (!count) - goto exit; - *tkns =3D kmemdup(data, count * sizeof(*data), GFP_KERNEL); - if (!(*tkns)) { - ret =3D -ENOMEM; - goto exit; - } - *num_tkns =3D count; - -exit: - kfree(data); - return ret; -} - -static int tokenize_input(const char __user *from, size_t count, - loff_t *ppos, u32 **tkns, size_t *num_tkns) -{ - char *buf; - int ret; - - buf =3D kmalloc(count + 1, GFP_KERNEL); - if (!buf) - return -ENOMEM; - - ret =3D simple_write_to_buffer(buf, count, ppos, from, count); - if (ret !=3D count) { - ret =3D ret >=3D 0 ? -EIO : ret; - goto exit; - } - - buf[count] =3D '\0'; - ret =3D strsplit_u32(buf, ",", tkns, num_tkns); -exit: - kfree(buf); - return ret; -} - static ssize_t sof_probes_dfs_points_read(struct file *file, char __user *= to, size_t count, loff_t *ppos) { @@ -548,8 +477,8 @@ sof_probes_dfs_points_write(struct file *file, const ch= ar __user *from, struct sof_probes_priv *priv =3D cdev->data; struct device *dev =3D &cdev->auxdev.dev; struct sof_probe_point_desc *desc; - size_t num_tkns, bytes; - u32 *tkns; + u32 num_elems, *array; + size_t bytes; int ret, err; =20 if (priv->extractor_stream_tag =3D=3D SOF_PROBES_INVALID_NODE_ID) { @@ -557,16 +486,18 @@ sof_probes_dfs_points_write(struct file *file, const = char __user *from, return -ENOENT; } =20 - ret =3D tokenize_input(from, count, ppos, &tkns, &num_tkns); + ret =3D parse_int_array_user(from, count, (int **)&array); if (ret < 0) return ret; - bytes =3D sizeof(*tkns) * num_tkns; - if (!num_tkns || (bytes % sizeof(*desc))) { + + num_elems =3D *array; + bytes =3D sizeof(*array) * num_elems; + if (bytes % sizeof(*desc)) { ret =3D -EINVAL; goto exit; } =20 - desc =3D (struct sof_probe_point_desc *)tkns; + desc =3D (struct sof_probe_point_desc *)&array[1]; =20 ret =3D pm_runtime_resume_and_get(dev); if (ret < 0 && ret !=3D -EACCES) { @@ -583,7 +514,7 @@ sof_probes_dfs_points_write(struct file *file, const ch= ar __user *from, if (err < 0) dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err); exit: - kfree(tkns); + kfree(array); return ret; } =20 @@ -603,22 +534,17 @@ sof_probes_dfs_points_remove_write(struct file *file,= const char __user *from, struct sof_client_dev *cdev =3D file->private_data; struct sof_probes_priv *priv =3D cdev->data; struct device *dev =3D &cdev->auxdev.dev; - size_t num_tkns; - u32 *tkns; int ret, err; + u32 *array; =20 if (priv->extractor_stream_tag =3D=3D SOF_PROBES_INVALID_NODE_ID) { dev_warn(dev, "no extractor stream running\n"); return -ENOENT; } =20 - ret =3D tokenize_input(from, count, ppos, &tkns, &num_tkns); + ret =3D parse_int_array_user(from, count, (int **)&array); if (ret < 0) return ret; - if (!num_tkns) { - ret =3D -EINVAL; - goto exit; - } =20 ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) { @@ -626,7 +552,7 @@ sof_probes_dfs_points_remove_write(struct file *file, c= onst char __user *from, goto exit; } =20 - ret =3D sof_probes_points_remove(cdev, tkns, num_tkns); + ret =3D sof_probes_points_remove(cdev, &array[1], array[0]); if (!ret) ret =3D count; =20 @@ -635,7 +561,7 @@ sof_probes_dfs_points_remove_write(struct file *file, c= onst char __user *from, if (err < 0) dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err); exit: - kfree(tkns); + kfree(array); return ret; } =20 --=20 2.25.1