Commit 9ee7a073 authored by ChenXiaoSong's avatar ChenXiaoSong Committed by ChenXiaoSong
Browse files

NFSv4: check FMODE_EXEC from open context mode in nfs4_opendata_access() 

mainline inclusion
from mainline-v6.2-rc1
commit d564d2c4
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB6DNK
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d564d2c4c2445cb0972453933dc87c2dcaac8597



--------------------------------

After converting file f_flags to open context mode by flags_to_mode(), open
context mode will have FMODE_EXEC when file open for exec, so we check
FMODE_EXEC from open context mode.

No functional change, just simplify the code.

Signed-off-by: default avatarChenXiaoSong <chenxiaosong2@huawei.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarChenXiaoSong <chenxiaosong@kylinos.cn>
parent 446ac7c5

fs/nfs/nfs4proc.c

+5 −11
Original line number Diff line number Diff line
@@ -2621,8 +2621,7 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data) 
 */

static int nfs4_opendata_access(const struct cred *cred,

				struct nfs4_opendata *opendata,

				struct nfs4_state *state, fmode_t fmode,

				int openflags)

				struct nfs4_state *state, fmode_t fmode)

{

	struct nfs_access_entry cache;

	u32 mask, flags;
@@ -2633,11 +2632,7 @@ static int nfs4_opendata_access(const struct cred *cred, 
		return 0;



	mask = 0;

	/*

	 * Use openflags to check for exec, because fmode won't

	 * always have FMODE_EXEC set when file open for exec.

	 */

	if (openflags & __FMODE_EXEC) {

	if (fmode & FMODE_EXEC) {

		/* ONLY check for exec rights */

		if (S_ISDIR(state->inode->i_mode))

			mask = NFS4_ACCESS_LOOKUP;
@@ -3027,7 +3022,7 @@ static unsigned nfs4_exclusive_attrset(struct nfs4_opendata *opendata, 
}



static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,

		int flags, struct nfs_open_context *ctx)

		struct nfs_open_context *ctx)

{

	struct nfs4_state_owner *sp = opendata->owner;

	struct nfs_server *server = sp->so_server;
@@ -3086,8 +3081,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, 
	/* Parse layoutget results before we check for access */

	pnfs_parse_lgopen(state->inode, opendata->lgp, ctx);



	ret = nfs4_opendata_access(sp->so_cred, opendata, state,

			acc_mode, flags);

	ret = nfs4_opendata_access(sp->so_cred, opendata, state, acc_mode);

	if (ret != 0)

		goto out;
@@ -3170,7 +3164,7 @@ static int _nfs4_do_open(struct inode *dir, 
	if (d_really_is_positive(dentry))

		opendata->state = nfs4_get_open_state(d_inode(dentry), sp);



	status = _nfs4_open_and_get_state(opendata, flags, ctx);

	status = _nfs4_open_and_get_state(opendata, ctx);

	if (status != 0)

		goto err_free_label;

	state = ctx->state;