NTFS: Change the mount options {u,f,d}mask to always parse the number as

      an octal number to conform to how chmod(1) works, too.  Thanks to
      Giuseppe Bilotta and Horst von Brand for pointing out the errors of
      my ways.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

2 files changed, 16 insertions, 4 deletions

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index e4fd6134244d..7f4007242893 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -90,7 +90,11 @@ ToDo/Notes:
           in the first buffer head instead of a driver global spin lock to
           improve scalability.
         - Minor fix to error handling and error message display in
-          fs/ntfs/aops.c::ntfs_prepare_nonresident_write(). 
+          fs/ntfs/aops.c::ntfs_prepare_nonresident_write().
+        - Change the mount options {u,f,d}mask to always parse the number as
+          an octal number to conform to how chmod(1) works, too.  Thanks to
+          Giuseppe Bilotta and Horst von Brand for pointing out the errors of
+          my ways.
 
 2.1.23 - Implement extension of resident files and make writing safe as well as
          many bug fixes, cleanups, and enhancements...
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index b2b392961268..453d0d51ea4b 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -126,6 +126,14 @@ static BOOL parse_options(ntfs_volume *vol, char *opt)
                 if (*v)                                                 \
                         goto needs_val;                                 \
         }
+#define NTFS_GETOPT_OCTAL(option, variable)                             \
+        if (!strcmp(p, option)) {                                       \
+                if (!v || !*v)                                          \
+                        goto needs_arg;                                 \
+                variable = simple_strtoul(ov = v, &v, 8);               \
+                if (*v)                                                 \
+                        goto needs_val;                                 \
+        }
 #define NTFS_GETOPT_BOOL(option, variable)                              \
         if (!strcmp(p, option)) {                                       \
                 BOOL val;                                               \
@@ -157,9 +165,9 @@ static BOOL parse_options(ntfs_volume *vol, char *opt)
                         *v++ = 0;
                 NTFS_GETOPT("uid", uid)
                 else NTFS_GETOPT("gid", gid)
-                else NTFS_GETOPT("umask", fmask = dmask)
-                else NTFS_GETOPT("fmask", fmask)
-                else NTFS_GETOPT("dmask", dmask)
+                else NTFS_GETOPT_OCTAL("umask", fmask = dmask)
+                else NTFS_GETOPT_OCTAL("fmask", fmask)
+                else NTFS_GETOPT_OCTAL("dmask", dmask)
                 else NTFS_GETOPT("mft_zone_multiplier", mft_zone_multiplier)
                 else NTFS_GETOPT_WITH_DEFAULT("sloppy", sloppy, TRUE)
                 else NTFS_GETOPT_BOOL("show_sys_files", show_sys_files)