Commit 504e5189 authored by Neil Brown's avatar Neil Brown Committed by Trond Myklebust
Browse files

Make nfs_file_cred more robust. 



As not all files have an associated open_context (e.g. device special
files), it is safest to test for the existence of the open context
before de-referencing it.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 18de9735

fs/nfs/nfs4proc.c

+4 −2
Original line number Diff line number Diff line
@@ -1659,9 +1659,11 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, 
		struct nfs_open_context *ctx;



		ctx = nfs_file_open_context(sattr->ia_file);

		if (ctx) {

			cred = ctx->cred;

			state = ctx->state;

		}

	}



	status = nfs4_do_setattr(inode, cred, fattr, sattr, state);

	if (status == 0)

include/linux/nfs_fs.h

+6 −2
Original line number Diff line number Diff line
@@ -367,8 +367,12 @@ static inline struct nfs_open_context *nfs_file_open_context(struct file *filp) 


static inline struct rpc_cred *nfs_file_cred(struct file *file)

{

	if (file != NULL)

		return nfs_file_open_context(file)->cred;

	if (file != NULL) {

		struct nfs_open_context *ctx =

			nfs_file_open_context(file);

		if (ctx)

			return ctx->cred;

	}

	return NULL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE