Skip to content

Commit da2346a

Browse files
Barremartinetd
authored andcommitted
9p: fix access mode flags being ORed instead of replaced
Since commit 1f3e414 ("9p: convert to the new mount API"), v9fs_apply_options() applies parsed mount flags with |= onto flags already set by v9fs_session_init(). For 9P2000.L, session_init sets V9FS_ACCESS_CLIENT as the default, so when the user mounts with "access=user", both bits end up set. Access mode checks compare against exact values, so having both bits set matches neither mode. This causes v9fs_fid_lookup() to fall through to the default switch case, using INVALID_UID (nobody/65534) instead of current_fsuid() for all fid lookups. Root is then unable to chown or perform other privileged operations. Fix by clearing the access mask before applying the user's choice. Fixes: 1f3e414 ("9p: convert to the new mount API") Signed-off-by: Pierre Barre <pierre@barre.sh> Reviewed-by: Christian Schoenebeck <linux_oss@crudebyte.com> Message-ID: <0ddc72da-d196-4f01-8755-0086f670e779@app.fastmail.com> Cc: stable@vger.kernel.org Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
1 parent 0fd76f1 commit da2346a

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

fs/9p/v9fs.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,11 @@ static void v9fs_apply_options(struct v9fs_session_info *v9ses,
413413
/*
414414
* Note that we must |= flags here as session_init already
415415
* set basic flags. This adds in flags from parsed options.
416+
* Default access flags must be cleared if session options
417+
* changes them to avoid mangling the setting.
416418
*/
419+
if (ctx->session_opts.flags & V9FS_ACCESS_MASK)
420+
v9ses->flags &= ~V9FS_ACCESS_MASK;
417421
v9ses->flags |= ctx->session_opts.flags;
418422
#ifdef CONFIG_9P_FSCACHE
419423
v9ses->cachetag = ctx->session_opts.cachetag;

0 commit comments

Comments
 (0)