Commit 854ee2e9 authored Dec 11, 2015 by Junxiao Bi Committed by Linus Torvalds Dec 12, 2015

ocfs2: fix SGID not inherited issue



Commit 8f1eb487 ("ocfs2: fix umask ignored issue") introduced an
issue, SGID of sub dir was not inherited from its parents dir.  It is
because SGID is set into "inode->i_mode" in ocfs2_get_init_inode(), but
is overwritten by "mode" which don't have SGID set later.

Fixes: 8f1eb487 ("ocfs2: fix umask ignored issue")
Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Acked-by: Srinivas Eeda <srinivas.eeda@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent a2b829d9

fs/ocfs2/namei.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -367,13 +367,11 @@ static int ocfs2_mknod(struct inode *dir,
		goto leave;
		}

		status = posix_acl_create(dir, &mode, &default_acl, &acl);
		status = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
		if (status) {
		mlog_errno(status);
		goto leave;
		}
		/* update inode->i_mode after mask with "umask". */
		inode->i_mode = mode;

		handle = ocfs2_start_trans(osb, ocfs2_mknod_credits(osb->sb,
		S_ISDIR(mode),