]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
NFSD: Replace READ* macros that decode the fattr4 mode attribute
authorChuck Lever <chuck.lever@oracle.com>
Thu, 19 Nov 2020 18:54:26 +0000 (13:54 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Jun 2024 12:52:35 +0000 (14:52 +0200)
[ Upstream commit 1c8f0ad7dd35fd12307904036c7c839f77b6e3f9 ]

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/nfsd/nfs4xdr.c

index 0fe57ca0f31acae362e162c43416ddbfc752d6dd..9dc73ab95eac9bbdc71c7b1cb2aa3ad5a0015014 100644 (file)
@@ -351,8 +351,11 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
        } else
                *acl = NULL;
        if (bmval[1] & FATTR4_WORD1_MODE) {
-               READ_BUF(4);
-               iattr->ia_mode = be32_to_cpup(p++);
+               u32 mode;
+
+               if (xdr_stream_decode_u32(argp->xdr, &mode) < 0)
+                       return nfserr_bad_xdr;
+               iattr->ia_mode = mode;
                iattr->ia_mode &= (S_IFMT | S_IALLUGO);
                iattr->ia_valid |= ATTR_MODE;
        }