Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcb63a9b authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Fix a missing initialisation when reading the SELinux label 



Ensure that _nfs4_do_get_security_label() also initialises the
SEQUENCE call correctly, by having it call into nfs4_call_sync().

Reported-by: default avatarJeff Layton <jlayton@redhat.com>
Cc: stable@vger.kernel.org # 3.11+
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 12207f69

fs/nfs/nfs4proc.c

+3 −3
Original line number Diff line number Diff line
@@ -4602,7 +4602,7 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf, 
	struct nfs4_label label = {0, 0, buflen, buf};



	u32 bitmask[3] = { 0, 0, FATTR4_WORD2_SECURITY_LABEL };

	struct nfs4_getattr_arg args = {

	struct nfs4_getattr_arg arg = {

		.fh		= NFS_FH(inode),

		.bitmask	= bitmask,

	};
@@ -4613,14 +4613,14 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf, 
	};

	struct rpc_message msg = {

		.rpc_proc	= &nfs4_procedures[NFSPROC4_CLNT_GETATTR],

		.rpc_argp	= &args,

		.rpc_argp	= &arg,

		.rpc_resp	= &res,

	};

	int ret;



	nfs_fattr_init(&fattr);



	ret = rpc_call_sync(server->client, &msg, 0);

	ret = nfs4_call_sync(server->client, server, &msg, &arg.seq_args, &res.seq_res, 0);

	if (ret)

		return ret;

	if (!(fattr.valid & NFS_ATTR_FATTR_V4_SECURITY_LABEL))