summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2013-11-01 10:42:15 -0400
committerJ. Bruce Fields <bfields@redhat.com>2013-11-01 13:40:46 -0400
commit3378b7f40d79930f0f447a164c7e8fcbe4480e40 (patch)
tree53e664508641b62b6766861f2551c1320c95388b /fs/nfsd
parent8217d146ab98a1790349d79c436176658e311e3c (diff)
downloadop-kernel-dev-3378b7f40d79930f0f447a164c7e8fcbe4480e40.zip
op-kernel-dev-3378b7f40d79930f0f447a164c7e8fcbe4480e40.tar.gz
nfsd4: fix discarded security labels on setattr
Security labels in setattr calls are currently ignored because we forget to set label->len. Cc: stable@vger.kernel.org Reported-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4xdr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 83db5a7..d9d7fa9 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -411,6 +411,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
label->data = kzalloc(dummy32 + 1, GFP_KERNEL);
if (!label->data)
return nfserr_jukebox;
+ label->len = dummy32;
defer_free(argp, kfree, label->data);
memcpy(label->data, buf, dummy32);
}
OpenPOWER on IntegriCloud