lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSv4.2: Clear FATTR4_WORD2_SECURITY_LABEL when done decoding

Browse Source 
[ Upstream commit eef7314caf2d73a94b68ba293cd105154d3a664e ]

We need to clear the FATTR4_WORD2_SECURITY_LABEL bitmap flag
irrespective of whether or not the label is too long.

Fixes: aa9c266962 ("NFS: Client implementation of Labeled-NFS")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Trond Myklebust 2022-10-18 16:44:47 -04:00 committed by Greg Kroah-Hartman
parent 2672977dc0
commit 96f3c70600
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/nfs4xdr.c
View File

@ -4169,6 +4169,7 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap,
p = xdr_inline_decode(xdr, len); p = xdr_inline_decode(xdr, len);
if (unlikely(!p)) if (unlikely(!p))
return -EIO; return -EIO;
bitmap[2] &= ~FATTR4_WORD2_SECURITY_LABEL;
if (len < NFS4_MAXLABELLEN) { if (len < NFS4_MAXLABELLEN) {
if (label) { if (label) {
if (label->len) { if (label->len) {
@ -4181,7 +4182,6 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap,
label->lfs = lfs; label->lfs = lfs;
status = NFS_ATTR_FATTR_V4_SECURITY_LABEL; status = NFS_ATTR_FATTR_V4_SECURITY_LABEL;
} }
bitmap[2] &= ~FATTR4_WORD2_SECURITY_LABEL;
} else } else
printk(KERN_WARNING "%s: label too long (%u)!\n", printk(KERN_WARNING "%s: label too long (%u)!\n",
__func__, len); __func__, len);