Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dc6b0d4 authored by Duane Griffin's avatar Duane Griffin Committed by Theodore Ts'o
Browse files

ext4: tighten restrictions on inode flags 



At the moment there are few restrictions on which flags may be set on
which inodes.  Specifically DIRSYNC may only be set on directories and
IMMUTABLE and APPEND may not be set on links.  Tighten that to disallow
TOPDIR being set on non-directories and only NODUMP and NOATIME to be set
on non-regular file, non-directories.

Introduces a flags masking function which masks flags based on mode and
use it during inode creation and when flags are set via the ioctl to
facilitate future consistency.

Signed-off-by: default avatarDuane Griffin <duaneg@dghda.com>
Acked-by: default avatarAndreas Dilger <adilger@sun.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 8fa43a81

fs/ext4/ext4.h

+17 −0
Original line number Diff line number Diff line
@@ -246,6 +246,23 @@ struct flex_groups { 
			   EXT4_NOCOMPR_FL | EXT4_JOURNAL_DATA_FL |\

			   EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL)



/* Flags that are appropriate for regular files (all but dir-specific ones). */

#define EXT4_REG_FLMASK (~(EXT4_DIRSYNC_FL | EXT4_TOPDIR_FL))



/* Flags that are appropriate for non-directories/regular files. */

#define EXT4_OTHER_FLMASK (EXT4_NODUMP_FL | EXT4_NOATIME_FL)



/* Mask out flags that are inappropriate for the given type of inode. */

static inline __u32 ext4_mask_flags(umode_t mode, __u32 flags)

{

	if (S_ISDIR(mode))

		return flags;

	else if (S_ISREG(mode))

		return flags & EXT4_REG_FLMASK;

	else

		return flags & EXT4_OTHER_FLMASK;

}



/*

 * Inode dynamic state flags

 */

fs/ext4/ialloc.c

+5 −9
Original line number Diff line number Diff line
@@ -885,16 +885,12 @@ got: 
	ei->i_disksize = 0;



	/*

	 * Don't inherit extent flag from directory. We set extent flag on

	 * newly created directory and file only if -o extent mount option is

	 * specified

	 * Don't inherit extent flag from directory, amongst others. We set

	 * extent flag on newly created directory and file only if -o extent

	 * mount option is specified

	 */

	ei->i_flags = EXT4_I(dir)->i_flags & EXT4_FL_INHERITED;

	if (S_ISLNK(mode))

		ei->i_flags &= ~(EXT4_IMMUTABLE_FL|EXT4_APPEND_FL);

	/* dirsync only applies to directories */

	if (!S_ISDIR(mode))

		ei->i_flags &= ~EXT4_DIRSYNC_FL;

	ei->i_flags =

		ext4_mask_flags(mode, EXT4_I(dir)->i_flags & EXT4_FL_INHERITED);

	ei->i_file_acl = 0;

	ei->i_dtime = 0;

	ei->i_block_group = group;

fs/ext4/ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		if (err)

			return err;



		if (!S_ISDIR(inode->i_mode))

			flags &= ~EXT4_DIRSYNC_FL;

		flags = ext4_mask_flags(inode->i_mode, flags);



		err = -EPERM;

		mutex_lock(&inode->i_mutex);