| From 03a4946f8f6a722e6f190f836f61347f9fa72801 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 4 Mar 2021 19:10:10 -0800 |
| Subject: net: intel: iavf: fix error return code of iavf_init_get_resources() |
| |
| From: Jia-Ju Bai <baijiaju1990@gmail.com> |
| |
| [ Upstream commit 6650d31f21b8a0043613ae0a4a2e42e49dc20b2d ] |
| |
| When iavf_process_config() fails, no error return code of |
| iavf_init_get_resources() is assigned. |
| To fix this bug, err is assigned with the return value of |
| iavf_process_config(), and then err is checked. |
| |
| Reported-by: TOTE Robot <oslab@tsinghua.edu.cn> |
| Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/iavf/iavf_main.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c |
| index 0a867d64d467..dc5b3c06d1e0 100644 |
| --- a/drivers/net/ethernet/intel/iavf/iavf_main.c |
| +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c |
| @@ -1776,7 +1776,8 @@ static int iavf_init_get_resources(struct iavf_adapter *adapter) |
| goto err_alloc; |
| } |
| |
| - if (iavf_process_config(adapter)) |
| + err = iavf_process_config(adapter); |
| + if (err) |
| goto err_alloc; |
| adapter->current_op = VIRTCHNL_OP_UNKNOWN; |
| |
| -- |
| 2.30.1 |
| |