Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[~andy/linux] / fs / omfs / inode.c

diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index e6213b3725d1b60cdc0b66a40c406df1f5d401c2..25d715c7c87abdd373918da6a42489332c88e3c0 100644 (file)
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -391,12 +391,16 @@ static int parse_options(char *options, struct omfs_sb_info *sbi)
                case Opt_uid:
                        if (match_int(&args[0], &option))
                                return 0;
-                       sbi->s_uid = option;
+                       sbi->s_uid = make_kuid(current_user_ns(), option);
+                       if (!uid_valid(sbi->s_uid))
+                               return 0;
                        break;
                case Opt_gid:
                        if (match_int(&args[0], &option))
                                return 0;
-                       sbi->s_gid = option;
+                       sbi->s_gid = make_kgid(current_user_ns(), option);
+                       if (!gid_valid(sbi->s_gid))
+                               return 0;
                        break;
                case Opt_umask:
                        if (match_octal(&args[0], &option))