Commit d6f4de70 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Trond Myklebust
Browse files

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



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: a02d6926 ("SUNRPC: Provide functions for managing universal addresses")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 3f7edeac

net/sunrpc/addr.c

+2 −2
Original line number Diff line number Diff line
@@ -284,10 +284,10 @@ char *rpc_sockaddr2uaddr(const struct sockaddr *sap, gfp_t gfp_flags) 
	}



	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;



	if (strlcat(addrbuf, portbuf, sizeof(addrbuf)) > sizeof(addrbuf))

	if (strlcat(addrbuf, portbuf, sizeof(addrbuf)) >= sizeof(addrbuf))

		return NULL;



	return kstrdup(addrbuf, gfp_flags);