From: Antoine Tenart Date: Thu, 17 Oct 2024 15:24:17 +0000 (+0200) Subject: net: sysctl: remove always-true condition X-Git-Tag: v6.13-rc1~135^2~241^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d631094e4d20d136f159c6e0f723b7aecbc12d2f;p=thirdparty%2Flinux.git net: sysctl: remove always-true condition Before adding a new line at the end of the temporary buffer in dump_cpumask, a length check is performed to ensure there is space for it. len = min(sizeof(kbuf) - 1, *lenp); len = scnprintf(kbuf, len, ...); if (len < *lenp) kbuf[len++] = '\n'; Note that the check is currently logically wrong, the written length is compared against the output buffer, not the temporary one. However this has no consequence as this is always true, even if fixed: scnprintf includes a null char at the end of the buffer but the returned length do not include it and there is always space for overriding it with a newline. Remove the condition. Signed-off-by: Antoine Tenart Reviewed-by: Simon Horman Signed-off-by: Paolo Abeni --- diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index b60fac380ceca..e7c0121dfaa16 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -69,8 +69,10 @@ static void dump_cpumask(void *buffer, size_t *lenp, loff_t *ppos, return; } - if (len < *lenp) - kbuf[len++] = '\n'; + /* scnprintf writes a trailing null char not counted in the returned + * length, override it with a newline. + */ + kbuf[len++] = '\n'; memcpy(buffer, kbuf, len); *lenp = len; *ppos += len;