main/busybox: fix mkdir on 64-bits

1 files changed, 42 insertions, 0 deletions

diff --git a/main/busybox/busybox-mkdir-permissions-64bit.patch b/main/busybox/busybox-mkdir-permissions-64bit.patch
new file mode 100644
index 000000000..54c109171
--- /dev/null
+++ b/main/busybox/busybox-mkdir-permissions-64bit.patch
@@ -0,0 +1,42 @@
+From 46db33a38d815a2f0bfcc8ad5094b23efcb4e9bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Fri, 10 Feb 2012 09:34:57 +0200
+Subject: [PATCH] mkdir: fix permissions on 64-bit platforms
+
+sizeof(long) != sizeof(mode_t), this causes the compare in
+bb_make_directory of (long)-1 != (mode_t)-1 to fail and mess up
+the permissions of final directory by doing chmod((mode_t) -1).
+---
+ coreutils/mkdir.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
+index a4429b1..b33b6bb 100644
+--- a/coreutils/mkdir.c
++++ b/coreutils/mkdir.c
+@@ -54,7 +54,7 @@ static const char mkdir_longopts[] ALIGN1 =
+ int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int mkdir_main(int argc UNUSED_PARAM, char **argv)
+ {
+-	mode_t mode = (mode_t)(-1);
++	long mode = -1;
+ 	int status = EXIT_SUCCESS;
+ 	int flags = 0;
+ 	unsigned opt;
+@@ -68,10 +68,11 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv)
+ #endif
+ 	opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
+ 	if (opt & 1) {
+-		mode = 0777;
+-		if (!bb_parse_mode(smode, &mode)) {
++		mode_t mmode = 0777;
++		if (!bb_parse_mode(smode, &mmode)) {
+ 			bb_error_msg_and_die("invalid mode '%s'", smode);
+ 		}
++		mode = mmode;
+ 	}
+ 	if (opt & 2)
+ 		flags |= FILEUTILS_RECUR;
+-- 
+1.7.9
+