We aren't verifying the parameter passed to the max_inline mount option,
so we won't report and fail the mount if a junk value is specified for
example, -o max_inline=abc.
This patch converts the max_inline option to %d and checks if it's a
number >= 0.

Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
v1->v2: use match_int ret value if error
        use %u instead of %d for parser

 fs/btrfs/super.c | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index b13d68506f15..02c7766e6849 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -344,7 +344,7 @@ static const match_table_t tokens = {
        {Opt_datacow, "datacow"},
        {Opt_nobarrier, "nobarrier"},
        {Opt_barrier, "barrier"},
-       {Opt_max_inline, "max_inline=%s"},
+       {Opt_max_inline, "max_inline=%u"},
        {Opt_alloc_start, "alloc_start=%s"},
        {Opt_thread_pool, "thread_pool=%d"},
        {Opt_compress, "compress"},
@@ -407,7 +407,7 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char 
*options,
                        unsigned long new_flags)
 {
        substring_t args[MAX_OPT_ARGS];
-       char *p, *num;
+       char *p;
        u64 cache_gen;
        int intarg;
        int ret = 0;
@@ -604,22 +604,11 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char 
*options,
                        }
                        break;
                case Opt_max_inline:
-                       num = match_strdup(&args[0]);
-                       if (num) {
-                               info->max_inline = memparse(num, NULL);
-                               kfree(num);
-
-                               if (info->max_inline) {
-                                       info->max_inline = min_t(u32,
-                                               info->max_inline,
-                                               info->sectorsize);
-                               }
-                               btrfs_info(info, "max_inline at %u",
-                                          info->max_inline);
-                       } else {
-                               ret = -ENOMEM;
+                       ret = match_int(&args[0], &intarg);
+                       if (ret)
                                goto out;
-                       }
+                       info->max_inline = min_t(u32, intarg, info->sectorsize);
+                       btrfs_info(info, "max_inline at %u", info->max_inline);
                        break;
                case Opt_alloc_start:
                        btrfs_info(info,
-- 
2.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to