diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2020-03-07 12:35:48 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-03-07 12:42:39 -0500 |
| commit | f106b01c98d7abc12af39aad4024f17ffa14dc06 (patch) | |
| tree | 3b4294e3c1eebf6e352b750d15842e5d5fb4c1b0 | |
| parent | 947315c86645e3ac3e814a49a7e7ab4b3498f64b (diff) | |
| download | e2fsprogs-f106b01c98d7abc12af39aad4024f17ffa14dc06.tar.gz | |
mke2fs: fix permissions setting with "mke2fs -d /path/files"
Set the directory for directories in cases where the owner permissions
is not rwx. This was reported[1] by Robert Yang but we are using a
different approach to fixing the issue.
[1] https://lore.kernel.org/r/1582542522-97508-1-git-send-email-liezhi.yang@windriver.com
Also set the permissions in a more portable way by making a
distinction between the host OS's permissions stats and Linux's
permissions. We still assume the low 12 bits are the historical Unix
assignments, but we don't assume ST_IFMT bits are the same as Linux's.
Reported-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | misc/create_inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/create_inode.c b/misc/create_inode.c index 1d9a596e1..e8d1df6b5 100644 --- a/misc/create_inode.c +++ b/misc/create_inode.c @@ -124,7 +124,7 @@ static errcode_t set_inode_extra(ext2_filsys fs, ext2_ino_t ino, ext2fs_set_i_uid_high(inode, st->st_uid >> 16); inode.i_gid = st->st_gid; ext2fs_set_i_gid_high(inode, st->st_gid >> 16); - inode.i_mode |= st->st_mode; + inode.i_mode = (LINUX_S_IFMT & inode.i_mode) | (~S_IFMT & st->st_mode); inode.i_atime = st->st_atime; inode.i_mtime = st->st_mtime; inode.i_ctime = st->st_ctime; @@ -662,7 +662,7 @@ errcode_t do_write_internal(ext2_filsys fs, ext2_ino_t cwd, const char *src, com_err(__func__, 0, "Warning: inode already set"); ext2fs_inode_alloc_stats2(fs, newfile, +1, 0); memset(&inode, 0, sizeof(inode)); - inode.i_mode = (statbuf.st_mode & ~LINUX_S_IFMT) | LINUX_S_IFREG; + inode.i_mode = (statbuf.st_mode & ~S_IFMT) | LINUX_S_IFREG; inode.i_atime = inode.i_ctime = inode.i_mtime = fs->now ? fs->now : time(0); inode.i_links_count = 1; |