Return-Path: linux-nfs-owner@vger.kernel.org Received: from fieldses.org ([174.143.236.118]:54064 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752919Ab3KAOtE (ORCPT ); Fri, 1 Nov 2013 10:49:04 -0400 Date: Fri, 1 Nov 2013 10:49:03 -0400 To: linux-nfs@vger.kernel.org Cc: jlayton@redhat.com Subject: [PATCH] nfsd4: fix discarded security labels on setattr Message-ID: <20131101144903.GA15493@fieldses.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii From: "J. Bruce Fields" Sender: linux-nfs-owner@vger.kernel.org List-ID: Jeff just noticed this. Argh. --b. commit 1012e867f57b3ae5712ea329065a9ab899c7986c Author: J. Bruce Fields Date: Fri Nov 1 10:42:15 2013 -0400 nfsd4: fix discarded security labels on setattr Security labels in setattr calls are currently ignored because we forget to set label->len. Reported-by: Jeff Layton Signed-off-by: J. Bruce Fields diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index d9454fe..438d818 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); }