lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ 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: 97167e8134 ("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>
This commit is contained in:
Wang Yufen 2022-12-02 12:00:37 +08:00 committed by Greg Kroah-Hartman
parent 7917484c99
commit 5a2028369d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/hw/hfi1/firmware.c
View File

@ -1786,6 +1786,7 @@ int parse_platform_config(struct hfi1_devdata *dd)
if (!dd->platform_config.data) { if (!dd->platform_config.data) {
dd_dev_err(dd, "%s: Missing config file\n", __func__); dd_dev_err(dd, "%s: Missing config file\n", __func__);
ret = -EINVAL;
goto bail; goto bail;
} }
ptr = (u32 *)dd->platform_config.data; ptr = (u32 *)dd->platform_config.data;
@ -1794,6 +1795,7 @@ int parse_platform_config(struct hfi1_devdata *dd)
ptr++; ptr++;
if (magic_num != PLATFORM_CONFIG_MAGIC_NUM) { if (magic_num != PLATFORM_CONFIG_MAGIC_NUM) {
dd_dev_err(dd, "%s: Bad config file\n", __func__); dd_dev_err(dd, "%s: Bad config file\n", __func__);
ret = -EINVAL;
goto bail; goto bail;
} }
@ -1817,6 +1819,7 @@ int parse_platform_config(struct hfi1_devdata *dd)
if (file_length > dd->platform_config.size) { if (file_length > dd->platform_config.size) {
dd_dev_info(dd, "%s:File claims to be larger than read size\n", dd_dev_info(dd, "%s:File claims to be larger than read size\n",
__func__); __func__);
ret = -EINVAL;
goto bail; goto bail;
} else if (file_length < dd->platform_config.size) { } else if (file_length < dd->platform_config.size) {
dd_dev_info(dd, dd_dev_info(dd,
@ -1837,6 +1840,7 @@ int parse_platform_config(struct hfi1_devdata *dd)
dd_dev_err(dd, "%s: Failed validation at offset %ld\n", dd_dev_err(dd, "%s: Failed validation at offset %ld\n",
__func__, (ptr - (u32 *) __func__, (ptr - (u32 *)
dd->platform_config.data)); dd->platform_config.data));
ret = -EINVAL;
goto bail; goto bail;
} }
@ -1883,6 +1887,7 @@ int parse_platform_config(struct hfi1_devdata *dd)
__func__, table_type, __func__, table_type,
(ptr - (u32 *) (ptr - (u32 *)
dd->platform_config.data)); dd->platform_config.data));
ret = -EINVAL;
goto bail; /* We don't trust this file now */ goto bail; /* We don't trust this file now */
} }
pcfgcache->config_tables[table_type].table = ptr; pcfgcache->config_tables[table_type].table = ptr;
@ -1907,6 +1912,7 @@ int parse_platform_config(struct hfi1_devdata *dd)
__func__, table_type, __func__, table_type,
(ptr - (ptr -
(u32 *)dd->platform_config.data)); (u32 *)dd->platform_config.data));
ret = -EINVAL;
goto bail; /* We don't trust this file now */ goto bail; /* We don't trust this file now */
} }
pcfgcache->config_tables[table_type].table_metadata = pcfgcache->config_tables[table_type].table_metadata =