瀏覽代碼

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: NeilBrown <neilb@suse.de>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Neil Brown 16 年之前
父節點
當前提交
504e518953
共有 2 個文件被更改,包括 10 次插入4 次删除
  1. 4 2
      fs/nfs/nfs4proc.c
  2. 6 2
      include/linux/nfs_fs.h

+ 4 - 2
fs/nfs/nfs4proc.c

@@ -1659,8 +1659,10 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
 		struct nfs_open_context *ctx;
 		struct nfs_open_context *ctx;
 
 
 		ctx = nfs_file_open_context(sattr->ia_file);
 		ctx = nfs_file_open_context(sattr->ia_file);
-		cred = ctx->cred;
-		state = ctx->state;
+		if (ctx) {
+			cred = ctx->cred;
+			state = ctx->state;
+		}
 	}
 	}
 
 
 	status = nfs4_do_setattr(inode, cred, fattr, sattr, state);
 	status = nfs4_do_setattr(inode, cred, fattr, sattr, state);

+ 6 - 2
include/linux/nfs_fs.h

@@ -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)
 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;
 	return NULL;
 }
 }