Skip to contentSkip to conversation

net: sunrpc: Fix 'snprintf' return value check in 'do_xprt_debugfs'

PATCH In review Fedor Tokarev 2 participants 2 messages Oct 15, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: sunrpc: Fix 'snprintf' return value check in 'do_xprt_debugfs'

'snprintf' returns the number of characters which would have been written if enough space had been available, excluding the terminating null byte. Thus, the return value of 'sizeof(buf)' means that the last character has been dropped.

---
 net/sunrpc/debugfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/sunrpc/debugfs.c +2 -2
index fd9bca2..56029e3 100644
@@ -128,13 +128,13 @@ static int do_xprt_debugfs(struct rpc_clnt *clnt, struct rpc_xprt *xprt, void *n
 		return 0;
 	len = snprintf(name, sizeof(name), "../../rpc_xprt/%s",
 		       xprt->debugfs->d_name.name);
-	if (len > sizeof(name))
+	if (len >= sizeof(name))
 		return -1;
 	if (*nump = 0)
 		strcpy(link, "xprt");
 	else {
 		len = snprintf(link, sizeof(link), "xprt%d", *nump);
-		if (len > sizeof(link))
+		if (len >= sizeof(link))
 			return -1;
 	}
 	debugfs_create_symlink(link, clnt->cl_debugfs, name);
Signature · 1 line
2.7.4
#1 lore raw

if xprt->debugfs->d_name.name can be what ever long it is more clever to use kasprintf()
the some for link (no idea how many xprt als possible)

jm2c
wh

________________________________________
Von: Fedor Tokarev [[email protected]]
Gesendet: Donnerstag, 15. Oktober 2020 15:59
An: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Betreff: [PATCH] net: sunrpc: Fix 'snprintf' return value check in 'do_xprt_debugfs'

'snprintf' returns the number of characters which would have been written if enough space had been available, excluding the terminating null byte. Thus, the return value of 'sizeof(buf)' means that the last character has been dropped.

---
 net/sunrpc/debugfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/sunrpc/debugfs.c +2 -2
index fd9bca2..56029e3 100644
@@ -128,13 +128,13 @@ static int do_xprt_debugfs(struct rpc_clnt *clnt, struct rpc_xprt *xprt, void *n
                return 0;
        len = snprintf(name, sizeof(name), "../../rpc_xprt/%s",
                       xprt->debugfs->d_name.name);
-       if (len > sizeof(name))
+       if (len >= sizeof(name))
                return -1;
        if (*nump == 0)
                strcpy(link, "xprt");
        else {
                len = snprintf(link, sizeof(link), "xprt%d", *nump);
-               if (len > sizeof(link))
+               if (len >= sizeof(link))
                        return -1;
        }
        debugfs_create_symlink(link, clnt->cl_debugfs, name);

--
2.7.4