From: Sidong Yang <realwakka@gmail.com>
To: linux-btrfs@vger.kernel.org, dsterba@suse.cz,
Qu Wenruo <quwenruo.btrfs@gmx.com>
Cc: Sidong Yang <realwakka@gmail.com>
Subject: [PATCH] btrfs-progs: common: make sure that qgroup id is in range
Date: Fri, 19 Mar 2021 17:09:35 +0000 [thread overview]
Message-ID: <20210319170935.39691-1-realwakka@gmail.com> (raw)
When user assign qgroup with qgroup id that is too big to exceeds
range and invade level value, and it works without any error. but
this action would be make undefined error. this code make sure that
qgroup id doesn't exceed range [0, 2^48-1]. and also checks qgroup
level that is in range [0, 2^16-1].
Signed-off-by: Sidong Yang <realwakka@gmail.com>
--
v2:
Use btrfs_qgroup_level() for checking
v3:
Add checks for qgroup level
---
common/utils.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/common/utils.c b/common/utils.c
index 57e41432..69fa6096 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -708,6 +708,10 @@ u64 parse_size_from_string(const char *s)
return ret;
}
+static bool valid_qgroup_level(u64 level) {
+ return !(level >> (sizeof(level) * 8 - BTRFS_QGROUP_LEVEL_SHIFT));
+}
+
u64 parse_qgroupid(const char *p)
{
char *s = strchr(p, '/');
@@ -727,15 +731,23 @@ u64 parse_qgroupid(const char *p)
id = strtoull(p, &ptr_parse_end, 10);
if (ptr_parse_end != ptr_src_end)
goto path;
+ if (btrfs_qgroup_level(id))
+ goto err;
return id;
}
level = strtoull(p, &ptr_parse_end, 10);
if (ptr_parse_end != s)
goto path;
+ if (!valid_qgroup_level(level))
+ goto err;
+
id = strtoull(s + 1, &ptr_parse_end, 10);
if (ptr_parse_end != ptr_src_end)
- goto path;
+ goto path;
+
+ if (btrfs_qgroup_level(id))
+ goto err;
return (level << BTRFS_QGROUP_LEVEL_SHIFT) | id;
--
2.25.1
next reply other threads:[~2021-03-19 17:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 17:09 Sidong Yang [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-03-15 15:56 [PATCH] btrfs-progs: common: make sure that qgroup id is in range Sidong Yang
2021-03-15 18:22 ` David Sterba
2021-03-16 5:44 ` Qu Wenruo
2021-03-16 12:58 ` Sidong Yang
2021-03-16 13:03 ` Qu Wenruo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210319170935.39691-1-realwakka@gmail.com \
--to=realwakka@gmail.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=quwenruo.btrfs@gmx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox