From b270fd0e44d47910592846903cf5b7a442dbd695 Mon Sep 17 00:00:00 2001 From: Kangjie Lu Date: Wed, 27 Nov 2019 19:49:53 +0800 Subject: [PATCH] net: ixgbevf: fix a missing check of ixgbevf_write_msg_read_ack mainline inclusion from mainline-v5.3-rc1 commit 20d437ee8f4899573e6ea76c06ef0206e98bccb6 category: bugfix bugzilla: 17940 CVE: NA ------------------------------------- If ixgbevf_write_msg_read_ack fails, return its error code upstream Signed-off-by: Kangjie Lu Tested-by: Andrew Bowers Reviewed-by: Mukesh Ojha Signed-off-by: Jeff Kirsher Signed-off-by: guodeqing Reviewed-by: Wenan Mao Signed-off-by: Yang Yingliang --- drivers/net/ethernet/intel/ixgbevf/vf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c index bf0577e819e1..7597d099c584 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.c +++ b/drivers/net/ethernet/intel/ixgbevf/vf.c @@ -506,9 +506,8 @@ static s32 ixgbevf_update_mc_addr_list_vf(struct ixgbe_hw *hw, vector_list[i++] = ixgbevf_mta_vector(hw, ha->addr); } - ixgbevf_write_msg_read_ack(hw, msgbuf, msgbuf, IXGBE_VFMAILBOX_SIZE); - - return 0; + return ixgbevf_write_msg_read_ack(hw, msgbuf, msgbuf, + IXGBE_VFMAILBOX_SIZE); } /** -- GitLab