Patchwork mkfs.ubifs: do not override root inode permissions

login
register
mail settings
Submitter Artem Bityutskiy
Date Sept. 7, 2010, 9:07 a.m.
Message ID <1283850462-4244-1-git-send-email-dedekind1@gmail.com>
Download mbox | patch
Permalink /patch/63978/
State New
Headers show

Comments

Artem Bityutskiy - Sept. 7, 2010, 9:07 a.m.
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

When mkfs.ubifs is used with -r dir, it does not make the root UBIFS
inode uid/gid/permissions to be equivalent to dir's permissions, but
it makes root inode permissions to be equivalent to uid = git = 0
(root) and permissions = u+rwx go+rx.

This patch changes the behavior and makes mkfs.ubifs use the
permissions of the directory containing the original files on the host.
I.e., it will be <dir>'s uid/git/permissions if case of mkfs.ubifs
-r <dir>.

This patch is a bit dangerous because it changes the behavior and may
have security implications if someone used the older version, relied
on this bug, and upgrades to the newer version.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---
 mkfs.ubifs/mkfs.ubifs.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
Artem Bityutskiy - Sept. 7, 2010, 10:07 a.m.
On Tue, 2010-09-07 at 12:07 +0300, Artem Bityutskiy wrote:
> From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
> 
> When mkfs.ubifs is used with -r dir, it does not make the root UBIFS
> inode uid/gid/permissions to be equivalent to dir's permissions, but
> it makes root inode permissions to be equivalent to uid = git = 0
> (root) and permissions = u+rwx go+rx.
> 
> This patch changes the behavior and makes mkfs.ubifs use the
> permissions of the directory containing the original files on the host.
> I.e., it will be <dir>'s uid/git/permissions if case of mkfs.ubifs
> -r <dir>.
> 
> This patch is a bit dangerous because it changes the behavior and may
> have security implications if someone used the older version, relied
> on this bug, and upgrades to the newer version.
> 
> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

Sorry for duplicate.

Patch

diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c
index 9f2a226..a4aebcb 100644
--- a/mkfs.ubifs/mkfs.ubifs.c
+++ b/mkfs.ubifs/mkfs.ubifs.c
@@ -1639,9 +1639,8 @@  static int write_data(void)
 	} else {
 		root_st.st_mtime = time(NULL);
 		root_st.st_atime = root_st.st_ctime = root_st.st_mtime;
+		root_st.st_mode = S_IFDIR | S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
 	}
-	root_st.st_uid = root_st.st_gid = 0;
-	root_st.st_mode = S_IFDIR | S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
 
 	head_flags = 0;
 	err = add_directory(root, UBIFS_ROOT_INO, &root_st, !root);