kevin/linux
1
Fork 0
Code

net: sunrpc: Fix an off by one in rpc_sockaddr2uaddr()

Browse Source 
The intent is to check if the strings' are truncated or not. So, >= should
be used instead of >, because strlcat() and snprintf() return the length of
the output, excluding the trailing NULL.

Fixes: a02d692611 ("SUNRPC: Provide functions for managing universal addresses")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Christophe JAILLET 2023-10-24 23:58:20 +02:00 committed by Trond Myklebust
parent 3f7edeac0b
commit d6f4de70f7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/sunrpc/addr.c
View File

@ -284,10 +284,10 @@ char *rpc_sockaddr2uaddr(const struct sockaddr *sap, gfp_t gfp_flags)
} }
if (snprintf(portbuf, sizeof(portbuf), if (snprintf(portbuf, sizeof(portbuf),
".%u.%u", port >> 8, port & 0xff) > (int)sizeof(portbuf)) ".%u.%u", port >> 8, port & 0xff) >= (int)sizeof(portbuf))
return NULL; return NULL;
if (strlcat(addrbuf, portbuf, sizeof(addrbuf)) > sizeof(addrbuf)) if (strlcat(addrbuf, portbuf, sizeof(addrbuf)) >= sizeof(addrbuf))
return NULL; return NULL;
return kstrdup(addrbuf, gfp_flags); return kstrdup(addrbuf, gfp_flags);