RDMA/srp: Fix error return code in srp_parse_options()

[ Upstream commit ed461b30b22c8fa85c25189c14cb89f29595cd14 ]

In the previous iteration of the while loop, the "ret" may have been
assigned a value of 0, so the error return code -EINVAL may have been
incorrectly set to 0. To fix set valid return code before calling to
goto. Also 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 <wangyufen@huawei.com>
Link: https://lore.kernel.org/r/1669953638-11747-2-git-send-email-wangyufen@huawei.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 1075c2a..b4d6a4a 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -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,8 +3480,15 @@ static int srp_parse_options(struct net *net, const char *buf,
                        break;
 
                case SRP_OPT_QUEUE_SIZE:
-                       if (match_int(args, &token) || token < 1) {
+                       ret = match_int(args, &token);
+                       if (ret) {
+                               pr_warn("match_int() failed for queue_size parameter '%s', Error %d\n",
+                                       p, ret);
+                               goto out;
+                       }
+                       if (token < 1) {
                                pr_warn("bad queue_size parameter '%s'\n", p);
+                               ret = -EINVAL;
                                goto out;
                        }
                        target->scsi_host->can_queue = token;
@@ -3490,25 +3499,40 @@ 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) {
+                               pr_warn("match_int() failed for max cmd_per_lun parameter '%s', Error %d\n",
+                                       p, ret);
+                               goto out;
+                       }
+                       if (token < 1) {
                                pr_warn("bad max cmd_per_lun parameter '%s'\n",
                                        p);
+                               ret = -EINVAL;
                                goto out;
                        }
                        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 (ret) {
+                               pr_warn("match_int() failed for max target_can_queue parameter '%s', Error %d\n",
+                                       p, ret);
+                               goto out;
+                       }
+                       if (token < 1) {
                                pr_warn("bad max target_can_queue parameter '%s'\n",
                                        p);
+                               ret = -EINVAL;
                                goto out;
                        }
                        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,6 +3541,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);
+                               ret = -EINVAL;
                                goto out;
                        }
                        target->io_class = token;
@@ -3539,16 +3564,24 @@ 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) {
+                               pr_warn("match_int() failed for max cmd_sg_entries parameter '%s', Error %d\n",
+                                       p, ret);
+                               goto out;
+                       }
+                       if (token < 1 || token > 255) {
                                pr_warn("bad max cmd_sg_entries parameter '%s'\n",
                                        p);
+                               ret = -EINVAL;
                                goto out;
                        }
                        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,43 +3589,77 @@ 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) {
+                               pr_warn("match_int() failed for max sg_tablesize parameter '%s', Error %d\n",
+                                       p, ret);
+                               goto out;
+                       }
+                       if (token < 1 || token > SG_MAX_SEGMENTS) {
                                pr_warn("bad max sg_tablesize parameter '%s'\n",
                                        p);
+                               ret = -EINVAL;
                                goto out;
                        }
                        target->sg_tablesize = token;
                        break;
 
                case SRP_OPT_COMP_VECTOR:
-                       if (match_int(args, &token) || token < 0) {
+                       ret = match_int(args, &token);
+                       if (ret) {
+                               pr_warn("match_int() failed for comp_vector parameter '%s', Error %d\n",
+                                       p, ret);
+                               goto out;
+                       }
+                       if (token < 0) {
                                pr_warn("bad comp_vector parameter '%s'\n", p);
+                               ret = -EINVAL;
                                goto out;
                        }
                        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) {
+                               pr_warn("match_int() failed for tl_retry_count parameter '%s', Error %d\n",
+                                       p, 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);
+                               ret = -EINVAL;
                                goto out;
                        }
                        target->tl_retry_count = token;
                        break;
 
                case SRP_OPT_MAX_IT_IU_SIZE:
-                       if (match_int(args, &token) || token < 0) {
+                       ret = match_int(args, &token);
+                       if (ret) {
+                               pr_warn("match_int() failed for max it_iu_size parameter '%s', Error %d\n",
+                                       p, ret);
+                               goto out;
+                       }
+                       if (token < 0) {
                                pr_warn("bad maximum initiator to target IU size '%s'\n", p);
+                               ret = -EINVAL;
                                goto out;
                        }
                        target->max_it_iu_size = token;
                        break;
 
                case SRP_OPT_CH_COUNT:
-                       if (match_int(args, &token) || token < 1) {
+                       ret = match_int(args, &token);
+                       if (ret) {
+                               pr_warn("match_int() failed for channel count parameter '%s', Error %d\n",
+                                       p, ret);
+                               goto out;
+                       }
+                       if (token < 1) {
                                pr_warn("bad channel count %s\n", p);
+                               ret = -EINVAL;
                                goto out;
                        }
                        target->ch_count = token;
@@ -3601,6 +3668,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);
+                       ret = -EINVAL;
                        goto out;
                }
        }