* [PATCH v3] SUNRPC: Use sysfs_emit in place of strlcpy/sprintf
@ 2023-06-14 13:37 Azeem Shaikh
2023-06-14 17:01 ` Chuck Lever III
0 siblings, 1 reply; 2+ messages in thread
From: Azeem Shaikh @ 2023-06-14 13:37 UTC (permalink / raw)
To: Chuck Lever, Jeff Layton, Kees Cook
Cc: linux-hardening, Azeem Shaikh, Neil Brown, Olga Kornievskaia,
Dai Ngo, Tom Talpey, linux-nfs, linux-kernel, Trond Myklebust,
Anna Schumaker, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, netdev
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 <azeemshaikh38@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] SUNRPC: Use sysfs_emit in place of strlcpy/sprintf
2023-06-14 13:37 [PATCH v3] SUNRPC: Use sysfs_emit in place of strlcpy/sprintf Azeem Shaikh
@ 2023-06-14 17:01 ` Chuck Lever III
0 siblings, 0 replies; 2+ messages in thread
From: Chuck Lever III @ 2023-06-14 17:01 UTC (permalink / raw)
To: Azeem Shaikh
Cc: Jeff Layton, Kees Cook, linux-hardening, Neil Brown,
Olga Kornievskaia, Dai Ngo, Tom Talpey, Linux NFS Mailing List,
open list, Trond Myklebust, Anna Schumaker, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, netdev
> On Jun 14, 2023, at 9:37 AM, Azeem Shaikh <azeemshaikh38@gmail.com> 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 <azeemshaikh38@gmail.com>
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-14 17:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-14 13:37 [PATCH v3] SUNRPC: Use sysfs_emit in place of strlcpy/sprintf Azeem Shaikh
2023-06-14 17:01 ` Chuck Lever III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).