From patchwork Sat Nov 26 03:35:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyufen X-Patchwork-Id: 26182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4435649wrr; Fri, 25 Nov 2022 19:24:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf4+9qI40v06EJforx1znJpDVUce+eo4lYs2/8Uyh/rvXT/iw0MqJkaVUGvIF6fS8YNVV2zW X-Received: by 2002:aa7:d613:0:b0:46a:ed3c:a31d with SMTP id c19-20020aa7d613000000b0046aed3ca31dmr834411edr.368.1669433079966; Fri, 25 Nov 2022 19:24:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669433079; cv=none; d=google.com; s=arc-20160816; b=ibgbdNRmxHfu6BNWKfMGVgcIdkokXsXd9Z1lkj48KQyC2qo145l5l18tzUzyG2Yoli tPSSl6Vs52oqNRUlAsfOVSirmVbIuflNSIURhZnkHXC4kahxO08xZbCWGGwD/hwnN9q0 b555+Z4lepo3QYARDHzdyydCSc4CmCN4XbUUSvD/fdxNp5U415TWQPegzlsjQ49AnR0H SmCS5UFYEDNxy+7JGif3v7BrPXXXxHeBbtAfU30mzEPBgENtmjK7K+qbaUNafMLSgeJq INhMHu+75wuSF/Me7HXDVDpnji+0KyGvSeogm74b5/yiEj9YCc73b2+yjmW7qOUuDKuZ zduA== 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=E6mo8KB6AKNchdpBsOd+FTm6o9SMlYfl/Mc9cLeHWJQ=; b=KHgy2e3EzQqegG7km1qTCqlccpz7wfalaVeMNoi3CrwLTWRxVnA6fTPQzhyISKOgOb uQ9+nbzY1vs7rNjGolSTF+BUFQiNzMEoQh9mXjHcvKLPi5gePl/GDDxM22c+1U3SHC3+ IcoJOyUv4rYQ05RS1sL+WoJGXsVYv4GOb12JRhLSGfJvVAmzg3kZLxHw5q6CBSl1OjTb UCbVZOc3mERdVSU5+J3z5iP6/FIVUuSDoqMHN5midR2tlPUiIOIiqGo3b+NLeH9Nbmlv cUm8aMVm54KjIudsUYEK4D5AfOqZ1zAfs6VqivMQg9g+na9bC7KQZOsQpv/O3U1KeVsB wktg== 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 z13-20020a05640240cd00b0045c3f6adb7csi5984388edb.215.2022.11.25.19.24.17; Fri, 25 Nov 2022 19:24:39 -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 S230162AbiKZDPC (ORCPT + 99 others); Fri, 25 Nov 2022 22:15:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229708AbiKZDPB (ORCPT ); Fri, 25 Nov 2022 22:15:01 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08E3755ABE; Fri, 25 Nov 2022 19:15:00 -0800 (PST) Received: from canpemm500010.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NJxfM0C6lzHw7Q; Sat, 26 Nov 2022 11:14:19 +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; Sat, 26 Nov 2022 11:14:57 +0800 From: Wang Yufen To: , , , CC: , , , , , Wang Yufen Subject: [PATCH v2 1/2] RDMA/hfi1: Fix error return code in parse_platform_config() Date: Sat, 26 Nov 2022 11:35:03 +0800 Message-ID: <1669433704-2254-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: dggems706-chm.china.huawei.com (10.3.19.183) 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?1750527461139394522?= X-GMAIL-MSGID: =?utf-8?q?1750527461139394522?= 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 bail_with_einval goto label and covert all "goto bail;" to "goto bail_with_einval:" where it's appropriate. Add dropping some duplicative "ret = -EINVAL;" lines, as Andy suggessted. Fixes: 97167e813415 ("staging/rdma/hfi1: Tune for unknown channel if configuration file is absent") Signed-off-by: Wang Yufen Reviewed-by: Andy Shevchenko --- drivers/infiniband/hw/hfi1/firmware.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/infiniband/hw/hfi1/firmware.c b/drivers/infiniband/hw/hfi1/firmware.c index 1d77514..44d8628 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,7 +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__); - goto bail; + goto bail_with_einval; } ptr = (u32 *)dd->platform_config.data; @@ -1751,7 +1751,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__); - goto bail; + goto bail_with_einval; } /* Field is file size in DWORDs */ @@ -1774,7 +1774,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__); - goto bail; + goto bail_with_einval; } else if (file_length < dd->platform_config.size) { dd_dev_info(dd, "%s:File claims to be smaller than read size, continuing\n", @@ -1794,7 +1794,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)); - goto bail; + goto bail_with_einval; } record_idx = *ptr & @@ -1837,7 +1837,7 @@ int parse_platform_config(struct hfi1_devdata *dd) __func__, table_type, (ptr - (u32 *) dd->platform_config.data)); - goto bail; /* We don't trust this file now */ + goto bail_with_einval; /* We don't trust this file now */ } pcfgcache->config_tables[table_type].table = ptr; } else { @@ -1856,7 +1856,7 @@ int parse_platform_config(struct hfi1_devdata *dd) __func__, table_type, (ptr - (u32 *)dd->platform_config.data)); - goto bail; /* We don't trust this file now */ + goto bail_with_einval; /* We don't trust this file now */ } pcfgcache->config_tables[table_type].table_metadata = ptr; @@ -1873,8 +1873,7 @@ int parse_platform_config(struct hfi1_devdata *dd) dd_dev_err(dd, "%s: Failed CRC check at offset %ld\n", __func__, (ptr - (u32 *)dd->platform_config.data)); - ret = -EINVAL; - goto bail; + goto bail_with_einval; } /* Jump the CRC DWORD */ ptr++; @@ -1882,6 +1881,9 @@ int parse_platform_config(struct hfi1_devdata *dd) pcfgcache->cache_valid = 1; return 0; + +bail_with_einval: + ret = -EINVAL; bail: memset(pcfgcache, 0, sizeof(struct platform_config_cache)); return ret;