In the previous while loop, "ret" may be assigned zero, , so the error
return code may be incorrectly set to 0 instead of -EINVAL.
Add out_with_einval goto label and covert all "goto out;" to "goto
out_with_einval:" where it's appropriate, alse investigate each case
separately as Andy suggessted.
Fixes: e711f968c49c ("IB/srp: replace custom implementation of hex2bin()")
Fixes: 2a174df0c602 ("IB/srp: Use kstrtoull() instead of simple_strtoull()")
Fixes: 19f313438c77 ("IB/srp: Add RDMA/CM support")
Signed-off-by: Wang Yufen <[email protected]>
---
drivers/infiniband/ulp/srp/ib_srp.c | 82 +++++++++++++++++++++++++------------
1 file changed, 56 insertions(+), 26 deletions(-)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 1075c2a..865ceb1 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -3343,7 +3343,7 @@ static int srp_parse_options(struct net *net, const char *buf,
bool has_port;
int opt_mask = 0;
int token;
- int ret = -EINVAL;
+ int ret;
int i;
options = kstrdup(buf, GFP_KERNEL);
@@ -3410,7 +3410,8 @@ static int srp_parse_options(struct net *net, const char *buf,
break;
case SRP_OPT_PKEY:
- if (match_hex(args, &token)) {
+ ret = match_hex(args, &token);
+ if (ret) {
pr_warn("bad P_Key parameter '%s'\n", p);
goto out;
}
@@ -3470,7 +3471,8 @@ static int srp_parse_options(struct net *net, const char *buf,
break;
case SRP_OPT_MAX_SECT:
- if (match_int(args, &token)) {
+ ret = match_int(args, &token);
+ if (ret) {
pr_warn("bad max sect parameter '%s'\n", p);
goto out;
}
@@ -3478,9 +3480,12 @@ static int srp_parse_options(struct net *net, const char *buf,
break;
case SRP_OPT_QUEUE_SIZE:
- if (match_int(args, &token) || token < 1) {
- pr_warn("bad queue_size parameter '%s'\n", p);
+ ret = match_int(args, &token);
+ if (ret)
goto out;
+ if (token < 1) {
+ pr_warn("bad queue_size parameter '%s'\n", p);
+ goto out_with_einval;
}
target->scsi_host->can_queue = token;
target->queue_size = token + SRP_RSP_SQ_SIZE +
@@ -3490,25 +3495,30 @@ static int srp_parse_options(struct net *net, const char *buf,
break;
case SRP_OPT_MAX_CMD_PER_LUN:
- if (match_int(args, &token) || token < 1) {
+ ret = match_int(args, &token);
+ if (ret)
+ goto out;
+ if (token < 1) {
pr_warn("bad max cmd_per_lun parameter '%s'\n",
p);
- goto out;
+ goto out_with_einval;
}
target->scsi_host->cmd_per_lun = token;
break;
case SRP_OPT_TARGET_CAN_QUEUE:
- if (match_int(args, &token) || token < 1) {
+ ret = match_int(args, &token);
+ if (token < 1) {
pr_warn("bad max target_can_queue parameter '%s'\n",
p);
- goto out;
+ goto out_with_einval;
}
target->target_can_queue = token;
break;
case SRP_OPT_IO_CLASS:
- if (match_hex(args, &token)) {
+ ret = match_hex(args, &token);
+ if (ret) {
pr_warn("bad IO class parameter '%s'\n", p);
goto out;
}
@@ -3517,7 +3527,7 @@ static int srp_parse_options(struct net *net, const char *buf,
pr_warn("unknown IO class parameter value %x specified (use %x or %x).\n",
token, SRP_REV10_IB_IO_CLASS,
SRP_REV16A_IB_IO_CLASS);
- goto out;
+ goto out_with_einval;
}
target->io_class = token;
break;
@@ -3539,16 +3549,20 @@ static int srp_parse_options(struct net *net, const char *buf,
break;
case SRP_OPT_CMD_SG_ENTRIES:
- if (match_int(args, &token) || token < 1 || token > 255) {
+ ret = match_int(args, &token);
+ if (ret)
+ goto out;
+ if (token < 1 || token > 255) {
pr_warn("bad max cmd_sg_entries parameter '%s'\n",
p);
- goto out;
+ goto out_with_einval;
}
target->cmd_sg_cnt = token;
break;
case SRP_OPT_ALLOW_EXT_SG:
- if (match_int(args, &token)) {
+ ret = match_int(args, &token);
+ if (ret) {
pr_warn("bad allow_ext_sg parameter '%s'\n", p);
goto out;
}
@@ -3556,44 +3570,58 @@ static int srp_parse_options(struct net *net, const char *buf,
break;
case SRP_OPT_SG_TABLESIZE:
- if (match_int(args, &token) || token < 1 ||
- token > SG_MAX_SEGMENTS) {
+ ret = match_int(args, &token);
+ if (ret)
+ goto out;
+ if (token < 1 || token > SG_MAX_SEGMENTS) {
pr_warn("bad max sg_tablesize parameter '%s'\n",
p);
- goto out;
+ goto out_with_einval;
}
target->sg_tablesize = token;
break;
case SRP_OPT_COMP_VECTOR:
- if (match_int(args, &token) || token < 0) {
- pr_warn("bad comp_vector parameter '%s'\n", p);
+ ret = match_int(args, &token);
+ if (ret)
goto out;
+ if (token < 0) {
+ pr_warn("bad comp_vector parameter '%s'\n", p);
+ goto out_with_einval;
}
target->comp_vector = token;
break;
case SRP_OPT_TL_RETRY_COUNT:
- if (match_int(args, &token) || token < 2 || token > 7) {
+ ret = match_int(args, &token);
+ if (ret)
+ goto out;
+ if (token < 2 || token > 7) {
pr_warn("bad tl_retry_count parameter '%s' (must be a number between 2 and 7)\n",
p);
- goto out;
+ goto out_with_einval;
}
target->tl_retry_count = token;
break;
case SRP_OPT_MAX_IT_IU_SIZE:
- if (match_int(args, &token) || token < 0) {
- pr_warn("bad maximum initiator to target IU size '%s'\n", p);
+ ret = match_int(args, &token);
+ if (ret)
goto out;
+ if (token < 0) {
+ pr_warn("bad maximum initiator to target IU size '%s'\n", p);
+ goto out_with_einval;
}
target->max_it_iu_size = token;
break;
case SRP_OPT_CH_COUNT:
- if (match_int(args, &token) || token < 1) {
- pr_warn("bad channel count %s\n", p);
+ ret = match_int(args, &token);
+ if (ret)
goto out;
+ if (token < 1) {
+ pr_warn("bad channel count %s\n", p);
+ goto out_with_einval;
}
target->ch_count = token;
break;
@@ -3601,7 +3629,7 @@ static int srp_parse_options(struct net *net, const char *buf,
default:
pr_warn("unknown parameter or missing value '%s' in target creation request\n",
p);
- goto out;
+ goto out_with_einval;
}
}
@@ -3620,6 +3648,8 @@ static int srp_parse_options(struct net *net, const char *buf,
target->scsi_host->cmd_per_lun,
target->scsi_host->can_queue);
+out_with_einval:
+ ret = -EINVAL;
out:
kfree(options);
return ret;
--
1.8.3.1
On Sat, Nov 26, 2022 at 11:35:04AM +0800, Wang Yufen wrote:
> In the previous while loop, "ret" may be assigned zero, , so the error
> return code may be incorrectly set to 0 instead of -EINVAL.
> Add out_with_einval goto label and covert all "goto out;" to "goto
> out_with_einval:" where it's appropriate, alse investigate each case
> separately as Andy suggessted.
It's better now, though you missed something...
...
> case SRP_OPT_TARGET_CAN_QUEUE:
> - if (match_int(args, &token) || token < 1) {
> + ret = match_int(args, &token);
Check for ret?
> + if (token < 1) {
> pr_warn("bad max target_can_queue parameter '%s'\n",
> p);
> - goto out;
> + goto out_with_einval;
> }
> target->target_can_queue = token;
> break;
...
> target->scsi_host->can_queue);
The below can't be like this, right?
> +out_with_einval:
> + ret = -EINVAL;
> out:
> kfree(options);
> return ret;
--
With Best Regards,
Andy Shevchenko
On Sat, Nov 26, 2022 at 02:02:14PM +0200, Andy Shevchenko wrote:
> On Sat, Nov 26, 2022 at 11:35:04AM +0800, Wang Yufen wrote:
...
> > target->scsi_host->can_queue);
>
> The below can't be like this, right?
>
> > +out_with_einval:
> > + ret = -EINVAL;
> > out:
> > kfree(options);
> > return ret;
One option is:
out:
kfree(options);
return ret;
out_with_einval:
ret = -EINVAL;
goto out;
--
With Best Regards,
Andy Shevchenko
在 2022/11/26 20:03, Andy Shevchenko 写道:
> On Sat, Nov 26, 2022 at 02:02:14PM +0200, Andy Shevchenko wrote:
>> On Sat, Nov 26, 2022 at 11:35:04AM +0800, Wang Yufen wrote:
>
> ...
>
>>> target->scsi_host->can_queue);
>>
>> The below can't be like this, right?
>>
>>> +out_with_einval:
>>> + ret = -EINVAL;
>>> out:
>>> kfree(options);
>>> return ret;
>
> One option is:
>
> out:
> kfree(options);
> return ret;
>
> out_with_einval:
> ret = -EINVAL;
> goto out;
I got it.
Thanks!
>
>
在 2022/11/26 20:02, Andy Shevchenko 写道:
> On Sat, Nov 26, 2022 at 11:35:04AM +0800, Wang Yufen wrote:
>> In the previous while loop, "ret" may be assigned zero, , so the error
>> return code may be incorrectly set to 0 instead of -EINVAL.
>> Add out_with_einval goto label and covert all "goto out;" to "goto
>> out_with_einval:" where it's appropriate, alse investigate each case
>> separately as Andy suggessted.
>
> It's better now, though you missed something...
>
> ...
>
>> case SRP_OPT_TARGET_CAN_QUEUE:
>> - if (match_int(args, &token) || token < 1) {
>> + ret = match_int(args, &token);
>
> Check for ret?
Yes, there's a ret check missing here, will change in v3
>
>> + if (token < 1) {
>> pr_warn("bad max target_can_queue parameter '%s'\n",
>> p);
>> - goto out;
>> + goto out_with_einval;
>> }
>> target->target_can_queue = token;
>> break;
>
> ...
>
>> target->scsi_host->can_queue);
>
> The below can't be like this, right?
Yes, I'm sorry for the breakage, also will change in v3
Thanks!
>
>> +out_with_einval:
>> + ret = -EINVAL;
>> out:
>> kfree(options);
>> return ret;
>