2024-01-25 14:46:50

by Jorge Mora

Subject: [PATCH] NFSD: change LISTXATTRS cookie encoding to big-endian

Function nfsd4_listxattr_validate_cookie() expects the cookie
as an offset to the list thus it needs to be encoded in big-endian.

Fixes: 23e50fe3a5e6 ("nfsd: implement the xattr functions and en/decode logic")
Signed-off-by: Jorge Mora <[email protected]>
---
fs/nfsd/nfs4xdr.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 26993bf368fc..913d566519bf 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -5142,6 +5142,7 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr,
u64 cookie;
char *sp;
__be32 status, tmp;
+ __be64 wire_cookie;
__be32 *p;
u32 nuser;

@@ -5235,7 +5236,8 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr,

cookie = offset + count;

- write_bytes_to_xdr_buf(xdr->buf, cookie_offset, &cookie, 8);
+ wire_cookie = cpu_to_be64(cookie);
+ write_bytes_to_xdr_buf(xdr->buf, cookie_offset, &wire_cookie, 8);
tmp = cpu_to_be32(count);
write_bytes_to_xdr_buf(xdr->buf, count_offset, &tmp, 4);
out:
--
2.43.0

2024-01-25 17:21:45

by Jeffrey Layton

Subject: Re: [PATCH] NFSD: change LISTXATTRS cookie encoding to big-endian

On Thu, 2024-01-25 at 07:46 -0700, Jorge Mora wrote:
> Function nfsd4_listxattr_validate_cookie() expects the cookie
> as an offset to the list thus it needs to be encoded in big-endian.
>
> Fixes: 23e50fe3a5e6 ("nfsd: implement the xattr functions and en/decode logic")
> Signed-off-by: Jorge Mora <[email protected]>
> ---
> fs/nfsd/nfs4xdr.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index 26993bf368fc..913d566519bf 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -5142,6 +5142,7 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr,
> u64 cookie;
> char *sp;
> __be32 status, tmp;
> + __be64 wire_cookie;
> __be32 *p;
> u32 nuser;
>
> @@ -5235,7 +5236,8 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr,
>
> cookie = offset + count;
>
> - write_bytes_to_xdr_buf(xdr->buf, cookie_offset, &cookie, 8);
> + wire_cookie = cpu_to_be64(cookie);
> + write_bytes_to_xdr_buf(xdr->buf, cookie_offset, &wire_cookie, 8);
> tmp = cpu_to_be32(count);
> write_bytes_to_xdr_buf(xdr->buf, count_offset, &tmp, 4);
> out:

Reviewed-by: Jeff Layton <[email protected]>