2023-06-14 13:39:55

by Azeem Shaikh

Subject: [PATCH v3] SUNRPC: Use sysfs_emit in place of strlcpy/sprintf

Part of an effort to remove strlcpy() tree-wide [1].

Direct replacement is safe here since the getter in kernel_params_ops
handles -errno return [2].

[1] https://github.com/KSPP/linux/issues/89
[2] https://elixir.bootlin.com/linux/v6.4-rc6/source/include/linux/moduleparam.h#L52

Signed-off-by: Azeem Shaikh <[email protected]>
---
net/sunrpc/svc.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index e6d4cec61e47..b011c318fef1 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -109,15 +109,15 @@ param_get_pool_mode(char *buf, const struct kernel_param *kp)
switch (*ip)
{
case SVC_POOL_AUTO:
- return strlcpy(buf, "auto\n", 20);
+ return sysfs_emit(buf, "auto\n");
case SVC_POOL_GLOBAL:
- return strlcpy(buf, "global\n", 20);
+ return sysfs_emit(buf, "global\n");
case SVC_POOL_PERCPU:
- return strlcpy(buf, "percpu\n", 20);
+ return sysfs_emit(buf, "percpu\n");
case SVC_POOL_PERNODE:
- return strlcpy(buf, "pernode\n", 20);
+ return sysfs_emit(buf, "pernode\n");
default:
- return sprintf(buf, "%d\n", *ip);
+ return sysfs_emit(buf, "%d\n", *ip);
}
}

--
2.41.0.162.gfafddb0af9-goog

2023-06-14 17:19:10

by Chuck Lever III

Subject: Re: [PATCH v3] SUNRPC: Use sysfs_emit in place of strlcpy/sprintf

> On Jun 14, 2023, at 9:37 AM, Azeem Shaikh <[email protected]> wrote:
>
> Part of an effort to remove strlcpy() tree-wide [1].
>
> Direct replacement is safe here since the getter in kernel_params_ops
> handles -errno return [2].
>
> [1] https://github.com/KSPP/linux/issues/89
> [2] https://elixir.bootlin.com/linux/v6.4-rc6/source/include/linux/moduleparam.h#L52
>
> Signed-off-by: Azeem Shaikh <[email protected]>

Thank you! Applied to nfsd-next.


> ---
> net/sunrpc/svc.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
> index e6d4cec61e47..b011c318fef1 100644
> --- a/net/sunrpc/svc.c
> +++ b/net/sunrpc/svc.c
> @@ -109,15 +109,15 @@ param_get_pool_mode(char *buf, const struct kernel_param *kp)
> switch (*ip)
> {
> case SVC_POOL_AUTO:
> - return strlcpy(buf, "auto\n", 20);
> + return sysfs_emit(buf, "auto\n");
> case SVC_POOL_GLOBAL:
> - return strlcpy(buf, "global\n", 20);
> + return sysfs_emit(buf, "global\n");
> case SVC_POOL_PERCPU:
> - return strlcpy(buf, "percpu\n", 20);
> + return sysfs_emit(buf, "percpu\n");
> case SVC_POOL_PERNODE:
> - return strlcpy(buf, "pernode\n", 20);
> + return sysfs_emit(buf, "pernode\n");
> default:
> - return sprintf(buf, "%d\n", *ip);
> + return sysfs_emit(buf, "%d\n", *ip);
> }
> }
>
> --
> 2.41.0.162.gfafddb0af9-goog
>
>

--
Chuck Lever