Commit b4487b93 authored by Jeffrey Mitchell's avatar Jeffrey Mitchell Committed by Trond Myklebust

nfs: Fix getxattr kernel panic and memory overflow

Move the buffer size check to decode_attr_security_label() before memcpy()
Only call memcpy() if the buffer is large enough

Fixes: aa9c2669 ("NFS: Client implementation of Labeled-NFS")
Signed-off-by: default avatarJeffrey Mitchell <jeffrey.mitchell@starlab.io>
[Trond: clean up duplicate test of label->len != 0]
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent d474f961
...@@ -5856,8 +5856,6 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf, ...@@ -5856,8 +5856,6 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf,
return ret; return ret;
if (!(fattr.valid & NFS_ATTR_FATTR_V4_SECURITY_LABEL)) if (!(fattr.valid & NFS_ATTR_FATTR_V4_SECURITY_LABEL))
return -ENOENT; return -ENOENT;
if (buflen < label.len)
return -ERANGE;
return 0; return 0;
} }
......
...@@ -4166,7 +4166,11 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, ...@@ -4166,7 +4166,11 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap,
return -EIO; return -EIO;
if (len < NFS4_MAXLABELLEN) { if (len < NFS4_MAXLABELLEN) {
if (label) { if (label) {
memcpy(label->label, p, len); if (label->len) {
if (label->len < len)
return -ERANGE;
memcpy(label->label, p, len);
}
label->len = len; label->len = len;
label->pi = pi; label->pi = pi;
label->lfs = lfs; label->lfs = lfs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment