NFSD: fix LISTXATTRS returning more bytes than maxcount
Subsystems (2)
PATCH 1/1 NFSD: fix LISTXATTRS returning more bytes than maxcount
The maxcount is the maximum number of bytes for the LISTXATTRS4resok result. This includes the cookie and the count for the name array, thus subtract 12 bytes from the maxcount: 8 (cookie) + 4 (array count) when filling up the name array.
--- fs/nfsd/nfs4xdr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfsd/nfs4xdr.c +2 -1
@@ -5168,7 +5168,8 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr, sp = listxattrs->lsxa_buf; nuser =0 ; - xdrleft = listxattrs->lsxa_maxcount; +/* Bytes left is maxcount - 8 (cookie) - 4 (array count) */ + xdrleft = listxattrs->lsxa_maxcount -12 ;while (left >0 && xdrleft >0 ) { slen =strlen (sp);
Signature · 1 line
2.43.0
Quoted 16 lines · Jorge Mora
The maxcount is the maximum number of bytes for the LISTXATTRS4resok result. This includes the cookie and the count for the name array, thus subtract 12 bytes from the maxcount: 8 (cookie) + 4 (array count) when filling up the name array.
Fixes 23e50fe3a5e6 ("nfsd: implement the xattr functions and en/decode logic")Signed-off-by Jorge Mora <[email protected]>--- fs/nfsd/nfs4xdr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/nfsd/nfs4xdr.c +0
-0
fs/nfsd/nfs4xdr.c nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr, · line 5175
Quoted 9 lines
fs/nfsd/nfs4xdr.c +2
-1@@ -5168,7 +5168,8 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr, sp = listxattrs->lsxa_buf; nuser =0 ; - xdrleft = listxattrs->lsxa_maxcount; +/* Bytes left is maxcount - 8 (cookie) - 4 (array count) */ + xdrleft = listxattrs->lsxa_maxcount -12 ;while (left >0 && xdrleft >0 ) { slen =strlen (sp);
Nice catch!
Quoted 28 lines · Jorge Mora
The maxcount is the maximum number of bytes for the LISTXATTRS4resok result. This includes the cookie and the count for the name array, thus subtract 12 bytes from the maxcount: 8 (cookie) + 4 (array count) when filling up the name array.
Fixes 23e50fe3a5e6 ("nfsd: implement the xattr functions and en/decode logic")Signed-off-by Jorge Mora <[email protected]>--- fs/nfsd/nfs4xdr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/nfsd/nfs4xdr.c +2
-1@@ -5168,7 +5168,8 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr, sp = listxattrs->lsxa_buf; nuser =0 ; - xdrleft = listxattrs->lsxa_maxcount; +/* Bytes left is maxcount - 8 (cookie) - 4 (array count) */ + xdrleft = listxattrs->lsxa_maxcount -12 ;while (left >0 && xdrleft >0 ) { slen =strlen (sp);Signature · 1 line
2.43.0
All four applied to nfsd-next.
Note this checkpatch complaint:
WARNING: From:/Signed-off-by: email address mismatch:
'From: Jorge Mora <[email protected]>' != 'Signed-off-by: Jorge Mora <[email protected]>'
I'm not sure whether that mismatch is a critical problem. These look like good fixes and b4 says your DKIM is good, so I applied them anyway.
Signature · 1 line
Chuck Lever