RDMA/hfi1: Fix error return code in parse_platform_config()

[ Upstream commit 725349f8ba1e78a146c6ff8f3ee5e2712e517106 ]

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.

Fixes: 97167e813415 ("staging/rdma/hfi1: Tune for unknown channel if configuration file is absent")
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Link: https://lore.kernel.org/r/1669953638-11747-1-git-send-email-wangyufen@huawei.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/hw/hfi1/firmware.c b/drivers/infiniband/hw/hfi1/firmware.c
index 1d77514..0c0cef5 100644 (file)
--- a/drivers/infiniband/hw/hfi1/firmware.c
+++ b/drivers/infiniband/hw/hfi1/firmware.c
@@ -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 =