From patchwork Thu Jan 28 02:19:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bingjingc X-Patchwork-Id: 12051627 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1ED8FC433E9 for ; Thu, 28 Jan 2021 02:20:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7DC964DCD for ; Thu, 28 Jan 2021 02:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229908AbhA1CUH (ORCPT ); Wed, 27 Jan 2021 21:20:07 -0500 Received: from mail.synology.com ([211.23.38.101]:48752 "EHLO synology.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229578AbhA1CUF (ORCPT ); Wed, 27 Jan 2021 21:20:05 -0500 Received: from localhost.localdomain (unknown [10.17.32.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by synology.com (Postfix) with ESMTPSA id DD728CE781CA; Thu, 28 Jan 2021 10:19:23 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synology.com; s=123; t=1611800363; bh=WxOuNU7pk5AdClNDp7CD6pHne9N33altWiuk+MKNGVY=; h=From:To:Cc:Subject:Date; b=RRGwCVTb4JAxGxIYaRwftgX86SR0CP+Q3Jg476yploIobhLHcPsKpEcrBHP2Nz2Hb bOqMGffeQaRcu8qzlPPyK9sI8U0ew/4FffgM9gFiYLjmPe+8zOW5B1yv4yXYtlIwPp ql+HWpS4fIIa9zRoRYGQaVVqbHWni9xuKRGnGCsg= From: bingjingc To: viro@zeniv.linux.org.uk, jack@suse.com, jack@suse.cz, axboe@kernel.dk, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, cccheng@synology.com, bingjingc@synology.com, robbieko@synology.com Subject: [PATCH 1/3] isofs: handle large user and group ID Date: Thu, 28 Jan 2021 10:19:14 +0800 Message-Id: <1611800354-9635-1-git-send-email-bingjingc@synology.com> X-Mailer: git-send-email 2.7.4 X-Synology-MCP-Status: no X-Synology-Spam-Flag: no X-Synology-Spam-Status: score=0, required 6, WHITELIST_FROM_ADDRESS 0 X-Synology-Virus-Status: no Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: BingJing Chang If uid or gid of mount options is larger than INT_MAX, isofs_fill_super will return -EINVAL. The problem can be encountered by a domain user or reproduced via: mount -o loop,uid=2147483648 ubuntu-16.04.6-server-amd64.iso /mnt This can be fixed as commit 233a01fa9c4c ("fuse: handle large user and group ID"). Reviewed-by: Robbie Ko Reviewed-by: Chung-Chiang Cheng Signed-off-by: BingJing Chang --- fs/isofs/inode.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index ec90773..342ac19 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -335,10 +335,23 @@ static const match_table_t tokens = { {Opt_err, NULL} }; +static int isofs_match_uint(substring_t *s, unsigned int *res) +{ + int err = -ENOMEM; + char *buf = match_strdup(s); + + if (buf) { + err = kstrtouint(buf, 10, res); + kfree(buf); + } + return err; +} + static int parse_options(char *options, struct iso9660_options *popt) { char *p; int option; + unsigned int uv; popt->map = 'n'; popt->rock = 1; @@ -434,17 +447,17 @@ static int parse_options(char *options, struct iso9660_options *popt) case Opt_ignore: break; case Opt_uid: - if (match_int(&args[0], &option)) + if (isofs_match_uint(&args[0], &uv)) return 0; - popt->uid = make_kuid(current_user_ns(), option); + popt->uid = make_kuid(current_user_ns(), uv); if (!uid_valid(popt->uid)) return 0; popt->uid_set = 1; break; case Opt_gid: - if (match_int(&args[0], &option)) + if (isofs_match_uint(&args[0], &uv)) return 0; - popt->gid = make_kgid(current_user_ns(), option); + popt->gid = make_kgid(current_user_ns(), uv); if (!gid_valid(popt->gid)) return 0; popt->gid_set = 1; From patchwork Thu Jan 28 02:19:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bingjingc X-Patchwork-Id: 12051629 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B319FC433E9 for ; Thu, 28 Jan 2021 02:20:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7465C64DCD for ; Thu, 28 Jan 2021 02:20:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231201AbhA1CUr (ORCPT ); Wed, 27 Jan 2021 21:20:47 -0500 Received: from mail.synology.com ([211.23.38.101]:50398 "EHLO synology.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231173AbhA1CUY (ORCPT ); Wed, 27 Jan 2021 21:20:24 -0500 Received: from localhost.localdomain (unknown [10.17.32.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by synology.com (Postfix) with ESMTPSA id 2073FCE781E9; Thu, 28 Jan 2021 10:19:42 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synology.com; s=123; t=1611800382; bh=NSxonVFVqna1DVcV3wqoEdl1NpU+injU1V92s7H48F4=; h=From:To:Cc:Subject:Date; b=Kd2tGdviUWjq348qQpajRc80LAsJo7/2Bb8Ylyjm/UQKlDRwjdv7QXjLHJzzls9NA N8Lkr5b7seHh4SXI4ZhNjTdfQRfHQcUBMnLnc938OYNc6m4Nqxq/eWlUrhMOghljon V2p1NTVTF0vWI5uDUpEegh8nyNu7FaGN4TyDd6eY= From: bingjingc To: viro@zeniv.linux.org.uk, jack@suse.com, jack@suse.cz, axboe@kernel.dk, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, cccheng@synology.com, bingjingc@synology.com, robbieko@synology.com Subject: [PATCH 2/3] udf: handle large user and group ID Date: Thu, 28 Jan 2021 10:19:32 +0800 Message-Id: <1611800372-9688-1-git-send-email-bingjingc@synology.com> X-Mailer: git-send-email 2.7.4 X-Synology-MCP-Status: no X-Synology-Spam-Flag: no X-Synology-Spam-Status: score=0, required 6, WHITELIST_FROM_ADDRESS 0 X-Synology-Virus-Status: no Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: BingJing Chang If uid or gid of mount options is larger than INT_MAX, udf_fill_super will return -EINVAL. The problem can be encountered by a domain user or reproduced via: mount -o loop,uid=2147483648 something-in-udf-format.iso /mnt This can be fixed as commit 233a01fa9c4c ("fuse: handle large user and group ID"). Reviewed-by: Robbie Ko Reviewed-by: Chung-Chiang Cheng Signed-off-by: BingJing Chang --- fs/udf/super.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/fs/udf/super.c b/fs/udf/super.c index d0df217..efeac8c 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -454,11 +454,24 @@ static const match_table_t tokens = { {Opt_err, NULL} }; +static int udf_match_uint(substring_t *s, unsigned int *res) +{ + int err = -ENOMEM; + char *buf = match_strdup(s); + + if (buf) { + err = kstrtouint(buf, 10, res); + kfree(buf); + } + return err; +} + static int udf_parse_options(char *options, struct udf_options *uopt, bool remount) { char *p; int option; + unsigned int uv; uopt->novrs = 0; uopt->session = 0xFFFFFFFF; @@ -508,17 +521,17 @@ static int udf_parse_options(char *options, struct udf_options *uopt, uopt->flags &= ~(1 << UDF_FLAG_USE_SHORT_AD); break; case Opt_gid: - if (match_int(args, &option)) + if (udf_match_uint(args, &uv)) return 0; - uopt->gid = make_kgid(current_user_ns(), option); + uopt->gid = make_kgid(current_user_ns(), uv); if (!gid_valid(uopt->gid)) return 0; uopt->flags |= (1 << UDF_FLAG_GID_SET); break; case Opt_uid: - if (match_int(args, &option)) + if (udf_match_uint(args, &uv)) return 0; - uopt->uid = make_kuid(current_user_ns(), option); + uopt->uid = make_kuid(current_user_ns(), uv); if (!uid_valid(uopt->uid)) return 0; uopt->flags |= (1 << UDF_FLAG_UID_SET); From patchwork Thu Jan 28 02:20:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bingjingc X-Patchwork-Id: 12051631 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3CD4C433DB for ; Thu, 28 Jan 2021 02:21:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9CD1164D9F for ; Thu, 28 Jan 2021 02:21:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231219AbhA1CVL (ORCPT ); Wed, 27 Jan 2021 21:21:11 -0500 Received: from mail.synology.com ([211.23.38.101]:51962 "EHLO synology.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231204AbhA1CUx (ORCPT ); Wed, 27 Jan 2021 21:20:53 -0500 Received: from localhost.localdomain (unknown [10.17.32.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by synology.com (Postfix) with ESMTPSA id 98DD3CE781CA; Thu, 28 Jan 2021 10:20:11 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synology.com; s=123; t=1611800411; bh=Ml/b5oOFCX4UpBoR+iFec6zbr09wPprtwU9FAP+aKdI=; h=From:To:Cc:Subject:Date; b=ZrXDdAiFalHJUNRDweURhwaRuqqU/ys6eDz7Uv2GGmnpL0hpu1/RjCOibBDii99In /XuVgt4Vbtl+eqdNVXllQxXukeEDpkGlTroleHLep5j9P9hYylPkR6R7K2589ktglA Z3XRb4TUp9fu4WTyU7/cVG0RvD1MVvvEuKprslNM= From: bingjingc To: viro@zeniv.linux.org.uk, jack@suse.com, jack@suse.cz, axboe@kernel.dk, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, cccheng@synology.com, bingjingc@synology.com, robbieko@synology.com Subject: [PATCH 3/3] parser: add unsigned int parser Date: Thu, 28 Jan 2021 10:20:01 +0800 Message-Id: <1611800401-9790-1-git-send-email-bingjingc@synology.com> X-Mailer: git-send-email 2.7.4 X-Synology-MCP-Status: no X-Synology-Spam-Flag: no X-Synology-Spam-Status: score=0, required 6, WHITELIST_FROM_ADDRESS 0 X-Synology-Virus-Status: no Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: BingJing Chang Will be used by fs parsing options Reviewed-by: Robbie Ko Reviewed-by: Chung-Chiang Cheng Signed-off-by: BingJing Chang --- fs/isofs/inode.c | 16 ++-------------- fs/udf/super.c | 16 ++-------------- include/linux/parser.h | 1 + lib/parser.c | 22 ++++++++++++++++++++++ 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 342ac19..21edc42 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -335,18 +335,6 @@ static const match_table_t tokens = { {Opt_err, NULL} }; -static int isofs_match_uint(substring_t *s, unsigned int *res) -{ - int err = -ENOMEM; - char *buf = match_strdup(s); - - if (buf) { - err = kstrtouint(buf, 10, res); - kfree(buf); - } - return err; -} - static int parse_options(char *options, struct iso9660_options *popt) { char *p; @@ -447,7 +435,7 @@ static int parse_options(char *options, struct iso9660_options *popt) case Opt_ignore: break; case Opt_uid: - if (isofs_match_uint(&args[0], &uv)) + if (match_uint(&args[0], &uv)) return 0; popt->uid = make_kuid(current_user_ns(), uv); if (!uid_valid(popt->uid)) @@ -455,7 +443,7 @@ static int parse_options(char *options, struct iso9660_options *popt) popt->uid_set = 1; break; case Opt_gid: - if (isofs_match_uint(&args[0], &uv)) + if (match_uint(&args[0], &uv)) return 0; popt->gid = make_kgid(current_user_ns(), uv); if (!gid_valid(popt->gid)) diff --git a/fs/udf/super.c b/fs/udf/super.c index efeac8c..2f83c12 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -454,18 +454,6 @@ static const match_table_t tokens = { {Opt_err, NULL} }; -static int udf_match_uint(substring_t *s, unsigned int *res) -{ - int err = -ENOMEM; - char *buf = match_strdup(s); - - if (buf) { - err = kstrtouint(buf, 10, res); - kfree(buf); - } - return err; -} - static int udf_parse_options(char *options, struct udf_options *uopt, bool remount) { @@ -521,7 +509,7 @@ static int udf_parse_options(char *options, struct udf_options *uopt, uopt->flags &= ~(1 << UDF_FLAG_USE_SHORT_AD); break; case Opt_gid: - if (udf_match_uint(args, &uv)) + if (match_uint(args, &uv)) return 0; uopt->gid = make_kgid(current_user_ns(), uv); if (!gid_valid(uopt->gid)) @@ -529,7 +517,7 @@ static int udf_parse_options(char *options, struct udf_options *uopt, uopt->flags |= (1 << UDF_FLAG_GID_SET); break; case Opt_uid: - if (udf_match_uint(args, &uv)) + if (match_uint(args, &uv)) return 0; uopt->uid = make_kuid(current_user_ns(), uv); if (!uid_valid(uopt->uid)) diff --git a/include/linux/parser.h b/include/linux/parser.h index 89e2b23..dd79f45 100644 --- a/include/linux/parser.h +++ b/include/linux/parser.h @@ -29,6 +29,7 @@ typedef struct { int match_token(char *, const match_table_t table, substring_t args[]); int match_int(substring_t *, int *result); +int match_uint(substring_t *s, unsigned int *result); int match_u64(substring_t *, u64 *result); int match_octal(substring_t *, int *result); int match_hex(substring_t *, int *result); diff --git a/lib/parser.c b/lib/parser.c index f5b3e5d..2ec9c4f 100644 --- a/lib/parser.c +++ b/lib/parser.c @@ -189,6 +189,28 @@ int match_int(substring_t *s, int *result) EXPORT_SYMBOL(match_int); /** + * match_uint: - scan a decimal representation of an integer from a substring_t + * @s: substring_t to be scanned + * @result: resulting integer on success + * + * Description: Attempts to parse the &substring_t @s as a decimal integer. On + * success, sets @result to the integer represented by the string and returns 0. + * Returns -ENOMEM, -EINVAL, or -ERANGE on failure. + */ +int match_uint(substring_t *s, unsigned int *result) +{ + int err = -ENOMEM; + char *buf = match_strdup(s); + + if (buf) { + err = kstrtouint(buf, 10, result); + kfree(buf); + } + return err; +} +EXPORT_SYMBOL(match_uint); + +/** * match_u64: - scan a decimal representation of a u64 from * a substring_t * @s: substring_t to be scanned