| Message ID | 20210305031010.5396-1-baijiaju1990@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | net: intel: iavf: fix error return code of iavf_init_get_resources() | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Thu, 4 Mar 2021 19:10:10 -0800 you wrote: > 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> > > [...] Here is the summary with links: - net: intel: iavf: fix error return code of iavf_init_get_resources() https://git.kernel.org/netdev/net/c/6650d31f21b8 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
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;
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> --- drivers/net/ethernet/intel/iavf/iavf_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)