NFSv4.2: Clear FATTR4_WORD2_SECURITY_LABEL when done decoding
Subsystems (2)
[email protected]
maintainerPATCH 1/3 NFSv4.2: Clear FATTR4_WORD2_SECURITY_LABEL when done decoding
From: Trond Myklebust <[email protected]>
We need to clear the FATTR4_WORD2_SECURITY_LABEL bitmap flag irrespective of whether or not the label is too long.
Fixes aa9c2669626c ("NFS: Client implementation of Labeled-NFS")
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/nfs4xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4xdr.c +1 -1
@@ -4234,6 +4234,7 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, p =xdr_inline_decode (xdr, len);if (unlikely (!p))return -EIO ; + bitmap[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ;if (len <NFS4_MAXLABELLEN ) {if (label) {if (label->len) {
@@ -4246,7 +4247,6 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, label->lfs = lfs; status =NFS_ATTR_FATTR_V4_SECURITY_LABEL ; } - bitmap[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ; }else printk (KERN_WARNING "%s: label too long (%u)!\n" , __func__, len);
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH 2/3 NFSv4.2: Always decode the security label
From: Trond Myklebust <[email protected]>
If the server returns a reply that includes a security label, then we must decode it whether or not we can store the results.
Fixes 1e2f67da8931 ("NFS: Remove the nfs4_label argument from decode_getattr_*() functions")
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/nfs4xdr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/nfs/nfs4xdr.c +4 -6
@@ -4755,12 +4755,10 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap,if (status <0 ) goto xdr_error; -if (fattr->label) { - status =decode_attr_security_label (xdr, bitmap, fattr->label); -if (status <0 ) - goto xdr_error; - fattr->valid |= status; - } + status =decode_attr_security_label (xdr, bitmap, fattr->label); +if (status <0 ) + goto xdr_error; + fattr->valid |= status; xdr_error:dprintk ("%s: xdr returned %d\n" , __func__, -status);
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH 3/3 NFSv4.2: Fix a memory stomp in decode_attr_security_label
From: Trond Myklebust <[email protected]>
We must not change the value of label->len if it is zero, since that indicates we stored a label.
Fixes b4487b935452 ("nfs: Fix getxattr kernel panic and memory overflow")
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/nfs4xdr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/nfs/nfs4xdr.c +4 -6
@@ -4236,12 +4236,10 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap,return -EIO ; bitmap[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ;if (len <NFS4_MAXLABELLEN ) { -if (label) { -if (label->len) { -if (label->len < len) -return -ERANGE ; -memcpy (label->label, p, len); - } +if (label && label->len) { +if (label->len < len) +return -ERANGE ; +memcpy (label->label, p, len); label->len = len; label->pi = pi; label->lfs = lfs;
Signature · 1 line
2.37.3