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 <atenart@kernel.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index b60fac380ceca8c085047bc34c5b2b55e69456b9..e7c0121dfaa1616da05f98376c07331618dbbcb5 100644 (file)
--- 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;