From: Li Nan <linan122@huawei.com>
To: <tj@kernel.org>, <josef@toxicpanda.com>, <axboe@kernel.dk>
Cc: <cgroups@vger.kernel.org>, <linux-block@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linan122@huawei.com>,
<yukuai3@huawei.com>, <yi.zhang@huawei.com>
Subject: [PATCH -next v2 2/9] blk-iocost: improve hanlder of match_u64()
Date: Wed, 30 Nov 2022 21:21:49 +0800 [thread overview]
Message-ID: <20221130132156.2836184-3-linan122@huawei.com> (raw)
In-Reply-To: <20221130132156.2836184-1-linan122@huawei.com>
From: Yu Kuai <yukuai3@huawei.com>
1) There are one place that return value of match_u64() is not checked.
2) If match_u64() failed, return value is set to -EINVAL despite that
there are other possible errnos.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Li Nan <linan122@huawei.com>
---
block/blk-iocost.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index fd495e823db2..c532129a1456 100644
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -3202,6 +3202,7 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input,
substring_t args[MAX_OPT_ARGS];
char buf[32];
int tok;
+ int err;
s64 v;
if (!*p)
@@ -3209,7 +3210,12 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input,
switch (match_token(p, qos_ctrl_tokens, args)) {
case QOS_ENABLE:
- match_u64(&args[0], &v);
+ err = match_u64(&args[0], &v);
+ if (err) {
+ ret = err;
+ goto out_unlock;
+ }
+
enable = v;
continue;
case QOS_CTRL:
@@ -3238,8 +3244,12 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input,
break;
case QOS_RLAT:
case QOS_WLAT:
- if (match_u64(&args[0], &v))
+ err = match_u64(&args[0], &v);
+ if (err) {
+ ret = err;
goto out_unlock;
+ }
+
qos[tok] = v;
break;
case QOS_MIN:
@@ -3374,6 +3384,7 @@ static ssize_t ioc_cost_model_write(struct kernfs_open_file *of, char *input,
substring_t args[MAX_OPT_ARGS];
char buf[32];
int tok;
+ int err;
u64 v;
if (!*p)
@@ -3399,8 +3410,13 @@ static ssize_t ioc_cost_model_write(struct kernfs_open_file *of, char *input,
tok = match_token(p, i_lcoef_tokens, args);
if (tok == NR_I_LCOEFS)
goto out_unlock;
- if (match_u64(&args[0], &v))
+
+ err = match_u64(&args[0], &v);
+ if (err) {
+ ret = err;
goto out_unlock;
+ }
+
u[tok] = v;
user = true;
}
--
2.31.1
next prev parent reply other threads:[~2022-11-30 13:01 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 13:21 [PATCH -next v2 0/9] iocost bugfix Li Nan
2022-11-30 13:21 ` [PATCH -next v2 1/9] blk-iocost: cleanup ioc_qos_write() and ioc_cost_model_write() Li Nan
2022-11-30 15:54 ` Christoph Hellwig
2022-11-30 15:55 ` Christoph Hellwig
2022-11-30 20:31 ` Tejun Heo
2022-11-30 13:21 ` Li Nan [this message]
2022-11-30 20:32 ` [PATCH -next v2 2/9] blk-iocost: improve hanlder of match_u64() Tejun Heo
2022-12-01 2:15 ` Yu Kuai
2022-12-01 10:08 ` Tejun Heo
2022-12-01 13:47 ` Yu Kuai
2022-11-30 13:21 ` [PATCH -next v2 3/9] blk-iocost: don't allow to configure bio based device Li Nan
2022-11-30 20:15 ` Tejun Heo
2022-11-30 13:21 ` [PATCH -next v2 4/9] blk-iocost: read params inside lock in sysfs apis Li Nan
2022-11-30 20:16 ` Tejun Heo
2022-11-30 13:21 ` [PATCH -next v2 5/9] blk-iocost: fix divide by 0 error in calc_lcoefs() Li Nan
2022-11-30 20:20 ` Tejun Heo
2022-11-30 13:21 ` [PATCH -next v2 6/9] blk-iocost: change div64_u64 to DIV64_U64_ROUND_UP in ioc_refresh_params() Li Nan
2022-11-30 20:22 ` Tejun Heo
2022-11-30 13:21 ` [PATCH -next v2 7/9] blk-iocost: fix UAF in ioc_pd_free Li Nan
2022-11-30 20:42 ` Tejun Heo
2022-12-06 7:53 ` Yu Kuai
2022-11-30 13:21 ` [PATCH -next v2 8/9] block: fix null-pointer dereference in ioc_pd_init Li Nan
2022-11-30 20:50 ` Tejun Heo
2022-12-01 2:12 ` Yu Kuai
2022-12-01 10:11 ` Tejun Heo
2022-12-01 10:23 ` Yu Kuai
2022-12-01 10:31 ` Tejun Heo
2022-12-05 9:32 ` Yu Kuai
2022-12-12 23:10 ` Tejun Heo
2022-11-30 13:21 ` [PATCH -next v2 9/9] blk-iocost: fix walk_list corruption Li Nan
2022-11-30 20:59 ` Tejun Heo
2022-12-01 1:19 ` Yu Kuai
2022-12-01 10:00 ` Tejun Heo
2022-12-01 10:14 ` Yu Kuai
2022-12-01 10:29 ` Tejun Heo
2022-12-01 13:43 ` Yu Kuai
2022-12-05 9:35 ` Yu Kuai
2022-11-30 17:26 ` [PATCH -next v2 0/9] iocost bugfix Jens Axboe
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=20221130132156.2836184-3-linan122@huawei.com \
--to=linan122@huawei.com \
--cc=axboe@kernel.dk \
--cc=cgroups@vger.kernel.org \
--cc=josef@toxicpanda.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
--cc=yi.zhang@huawei.com \
--cc=yukuai3@huawei.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;
as well as URLs for NNTP newsgroup(s).