* [PATCH] net: sunrpc: Fix an off by one in root_nfs_cat()
@ 2023-10-24 21:55 Christophe JAILLET
2023-10-25 12:34 ` Benjamin Coddington
2023-10-26 14:57 ` Simon Horman
0 siblings, 2 replies; 3+ messages in thread
From: Christophe JAILLET @ 2023-10-24 21:55 UTC (permalink / raw)
To: chuck.lever, jlayton, neilb, kolga, Dai.Ngo, tom, trond.myklebust,
anna, davem, edumazet, kuba, pabeni
Cc: linux-nfs, netdev, linux-kernel, kernel-janitors,
Christophe JAILLET
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: a02d69261134 ("SUNRPC: Provide functions for managing universal addresses")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
net/sunrpc/addr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c
index d435bffc6199..97ff11973c49 100644
--- a/net/sunrpc/addr.c
+++ b/net/sunrpc/addr.c
@@ -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);
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net: sunrpc: Fix an off by one in root_nfs_cat()
2023-10-24 21:55 [PATCH] net: sunrpc: Fix an off by one in root_nfs_cat() Christophe JAILLET
@ 2023-10-25 12:34 ` Benjamin Coddington
2023-10-26 14:57 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Benjamin Coddington @ 2023-10-25 12:34 UTC (permalink / raw)
To: Christophe JAILLET
Cc: chuck.lever, jlayton, neilb, kolga, Dai.Ngo, tom, trond.myklebust,
anna, davem, edumazet, kuba, pabeni, linux-nfs, netdev,
linux-kernel, kernel-janitors
On 24 Oct 2023, at 17:55, Christophe JAILLET wrote:
> 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: a02d69261134 ("SUNRPC: Provide functions for managing universal addresses")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Ben
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net: sunrpc: Fix an off by one in root_nfs_cat()
2023-10-24 21:55 [PATCH] net: sunrpc: Fix an off by one in root_nfs_cat() Christophe JAILLET
2023-10-25 12:34 ` Benjamin Coddington
@ 2023-10-26 14:57 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2023-10-26 14:57 UTC (permalink / raw)
To: Christophe JAILLET
Cc: chuck.lever, jlayton, neilb, kolga, Dai.Ngo, tom, trond.myklebust,
anna, davem, edumazet, kuba, pabeni, linux-nfs, netdev,
linux-kernel, kernel-janitors
On Tue, Oct 24, 2023 at 11:55:30PM +0200, Christophe JAILLET wrote:
> 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: a02d69261134 ("SUNRPC: Provide functions for managing universal addresses")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Simon Horman <horms@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-26 14:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-24 21:55 [PATCH] net: sunrpc: Fix an off by one in root_nfs_cat() Christophe JAILLET
2023-10-25 12:34 ` Benjamin Coddington
2023-10-26 14:57 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox