From patchwork Tue Nov 29 02:04:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyufen X-Patchwork-Id: 27023 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp66591wrr; Mon, 28 Nov 2022 17:53:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf7AAW2mS4aifdIj2ha+Ia+Tf2t/Wc/V9YqztkYOY297qkj8zo6oIzImSaAZvq3+IhesIvuL X-Received: by 2002:aa7:cd4d:0:b0:46a:832a:b851 with SMTP id v13-20020aa7cd4d000000b0046a832ab851mr22680160edw.127.1669686783161; Mon, 28 Nov 2022 17:53:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669686783; cv=none; d=google.com; s=arc-20160816; b=HOpUgd1Hj190Sz86ARIJWzzeElh7d+IdotNfwdyAQekVAtqc+XKamysFjIw0iyWKBK 3LNjhGTKfji6nZLjArnEQujdOxC0nTSM2kAFWw4ufH5uX6agoMpJSpZEGHR4+Uspx2NI FPuQezwzFqde9J6Ie+2yoT748CPQHng74jfBKxqBhnT7eKIzPEpdyozoYsxfSW5XusnL +JFU+iSy0vmZF6/wwqbaQDHW8IRpeZQC2g7gF3v4lDXMu4i+/HTV2nwH+d4wVUFkCUEk gEES9+bc+EwL1oXSd4ApE+pJMtykFtBiB5BCGUpyvNcvkeD3xy/huz/HvkXX/OESt/ff HnWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=F/TYKKsUmdGZALO3CVz+M1oEQMig2EubeNSgRYnM/uI=; b=mxu8X5PH+TdgVsAHS0E1V6uODUc9WS54fpOa8St5oZjIBvZkFKpDp1uaC16fEi0Hz9 RgShwGhc3ByoDQ178VJLVPRkpyaWwNtSx/EA7cwyvxGllfsGJQPfXTyFFRYKQFJPZNpc qlIn1i3UlsQCP4Cqc4VmYC4J6N49Wz1AfvwtGO22ihxqUq3GOGgOxy883qJPIlplkbkU WVKHJEDzy3xbf0qEX+Rqc8eWroIgiU3xzl27n3Pl5JiEgPFnwPFJNwZ8Wze93WlIe3O7 lgyuABYrgeL11LM2elK8RJD0k89Nbo8azRYIr1uS7zCwx3DXwLs4rDj5FznfXi4gELCi JA7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s11-20020a170906a18b00b007973c84ba55si8891934ejy.298.2022.11.28.17.52.39; Mon, 28 Nov 2022 17:53:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235128AbiK2BoS (ORCPT + 99 others); Mon, 28 Nov 2022 20:44:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234897AbiK2BoQ (ORCPT ); Mon, 28 Nov 2022 20:44:16 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19B7455BB; Mon, 28 Nov 2022 17:44:16 -0800 (PST) Received: from canpemm500010.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NLlVF0cYSzHwFj; Tue, 29 Nov 2022 09:43:33 +0800 (CST) Received: from localhost.localdomain (10.175.112.70) by canpemm500010.china.huawei.com (7.192.105.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 29 Nov 2022 09:44:14 +0800 From: Wang Yufen To: , , , CC: , , , , , Wang Yufen Subject: [PATCH v4 1/2] RDMA/hfi1: Fix error return code in parse_platform_config() Date: Tue, 29 Nov 2022 10:04:18 +0800 Message-ID: <1669687459-14180-1-git-send-email-wangyufen@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.112.70] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500010.china.huawei.com (7.192.105.118) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750565875094046234?= X-GMAIL-MSGID: =?utf-8?q?1750793488605027695?= In the previous while loop, "ret" may be assigned zero, so the error return code may be incorrectly set to 0 instead of -EINVAL. Fixes: 97167e813415 ("staging/rdma/hfi1: Tune for unknown channel if configuration file is absent") Signed-off-by: Wang Yufen --- drivers/infiniband/hw/hfi1/firmware.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/hfi1/firmware.c b/drivers/infiniband/hw/hfi1/firmware.c index 1d77514..9a08c1a 100644 --- a/drivers/infiniband/hw/hfi1/firmware.c +++ b/drivers/infiniband/hw/hfi1/firmware.c @@ -1730,7 +1730,7 @@ int parse_platform_config(struct hfi1_devdata *dd) u32 *ptr = NULL; u32 header1 = 0, header2 = 0, magic_num = 0, crc = 0, file_length = 0; u32 record_idx = 0, table_type = 0, table_length_dwords = 0; - int ret = -EINVAL; /* assume failure */ + int ret; /* * For integrated devices that did not fall back to the default file, @@ -1743,6 +1743,7 @@ int parse_platform_config(struct hfi1_devdata *dd) if (!dd->platform_config.data) { dd_dev_err(dd, "%s: Missing config file\n", __func__); + ret = -EINVAL; goto bail; } ptr = (u32 *)dd->platform_config.data; @@ -1751,6 +1752,7 @@ int parse_platform_config(struct hfi1_devdata *dd) ptr++; if (magic_num != PLATFORM_CONFIG_MAGIC_NUM) { dd_dev_err(dd, "%s: Bad config file\n", __func__); + ret = -EINVAL; goto bail; } @@ -1774,6 +1776,7 @@ int parse_platform_config(struct hfi1_devdata *dd) if (file_length > dd->platform_config.size) { dd_dev_info(dd, "%s:File claims to be larger than read size\n", __func__); + ret = -EINVAL; goto bail; } else if (file_length < dd->platform_config.size) { dd_dev_info(dd, @@ -1794,6 +1797,7 @@ int parse_platform_config(struct hfi1_devdata *dd) dd_dev_err(dd, "%s: Failed validation at offset %ld\n", __func__, (ptr - (u32 *) dd->platform_config.data)); + ret = -EINVAL; goto bail; } @@ -1837,6 +1841,7 @@ int parse_platform_config(struct hfi1_devdata *dd) __func__, table_type, (ptr - (u32 *) dd->platform_config.data)); + ret = -EINVAL; goto bail; /* We don't trust this file now */ } pcfgcache->config_tables[table_type].table = ptr; @@ -1856,6 +1861,7 @@ int parse_platform_config(struct hfi1_devdata *dd) __func__, table_type, (ptr - (u32 *)dd->platform_config.data)); + ret = -EINVAL; goto bail; /* We don't trust this file now */ } pcfgcache->config_tables[table_type].table_metadata = From patchwork Tue Nov 29 02:04:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyufen X-Patchwork-Id: 27024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp66848wrr; Mon, 28 Nov 2022 17:54:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf7JunMOz12gl9jLsANgqLpYqxjR4t4X3ZUvXFQNu/JcoKSGHCzLYcah2NG/YptQOXeuQbYu X-Received: by 2002:a17:903:2014:b0:189:81dd:6b97 with SMTP id s20-20020a170903201400b0018981dd6b97mr10214900pla.173.1669686841337; Mon, 28 Nov 2022 17:54:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669686841; cv=none; d=google.com; s=arc-20160816; b=mQuoYnnHQa0E3BUcMZjWjcf++8Bvde9ZaJpoJBQe6BZBsIbNuqrb6pbVApQvmO2lvy /rmIGfcxM3myT6HBkiabVFOWFW3Jn3E4ze9lNuz5/gRcJhh3Cqrevmrfkll0PUUe4bTW CQ9PV0GLeJi88zBkmW0lXmzckqZ+AW64MWA1hpguJXk1oTotMaBU6rb/QA6rQAJVzIww PgvC1ngu5x13WTKqbjQu+qaDTwrZRg79aXa2NsoOpxvU8SqP971npzNen8/R3l+nFT6V GKDrXkPU4F2PJHL7xJXoIhZbbD2kt1x8/fc1gaKAG3rBBBaX18UIz16etRO6+vWIRkEd SFbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=w2PgKvDjnSqkBCXVFirWDetWsT1yYz4lGjg4q7AxpsM=; b=SMJ+/KTfTdggBLmeD5agx9sOk/SDBc3GHP67gfWyvdFo2Bqoy5qKcIVCrY5eTY5phz 5rLGvupdyZfxzbbV/VsGMMaaUev4nyKvB5yye4Hzoq7wO02vCcQeqUqPQMUTTh2fw43p C0m+P/o+Ki9N5oyHt5Do5bIbnJdmhCv+56RLGgvW2H/p/ybD4nZU/xrLbRJVobJ0shY0 M5v6yQdhryHjkeTyaHJwERUCzzAy1fIp6an6oxK9kbJwH7IpE+aGm5tAAmCulzr/csgB NPwS2W1rsifacDsq0GGPlNa30n1SGg/YLAJfiPSq2UVy6l+avLxC6oUTs/OfY6VOafZ/ XfLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x6-20020a17090a970600b00208e05957c9si348364pjo.20.2022.11.28.17.53.48; Mon, 28 Nov 2022 17:54:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234897AbiK2BoX (ORCPT + 99 others); Mon, 28 Nov 2022 20:44:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235125AbiK2BoS (ORCPT ); Mon, 28 Nov 2022 20:44:18 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CE553C6D1; Mon, 28 Nov 2022 17:44:17 -0800 (PST) Received: from canpemm500010.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NLlVJ12SqzmWHj; Tue, 29 Nov 2022 09:43:36 +0800 (CST) Received: from localhost.localdomain (10.175.112.70) by canpemm500010.china.huawei.com (7.192.105.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 29 Nov 2022 09:44:14 +0800 From: Wang Yufen To: , , , CC: , , , , , Wang Yufen Subject: [PATCH v4 2/2] RDMA/srp: Fix error return code in srp_parse_options() Date: Tue, 29 Nov 2022 10:04:19 +0800 Message-ID: <1669687459-14180-2-git-send-email-wangyufen@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1669687459-14180-1-git-send-email-wangyufen@huawei.com> References: <1669687459-14180-1-git-send-email-wangyufen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.70] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500010.china.huawei.com (7.192.105.118) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750793549096450335?= X-GMAIL-MSGID: =?utf-8?q?1750793549096450335?= In the previous while loop, "ret" may be assigned zero, , so the error return code may be incorrectly set to 0 instead of -EINVAL. 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 --- drivers/infiniband/ulp/srp/ib_srp.c | 71 +++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 1075c2a..692c69a 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,8 +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) { + ret = match_int(args, &token); + if (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 +3496,34 @@ 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); + 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) + 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 +3532,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 +3555,21 @@ 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); + 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 +3577,62 @@ 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); + 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) + 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) + 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) + 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) + goto out; + if (token < 1) { pr_warn("bad channel count %s\n", p); + ret = -EINVAL; goto out; } target->ch_count = token; @@ -3601,6 +3641,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; } }