From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 10 Feb 2016 22:45:47 +0000 (-0800)
Subject: fm10k: prevent possibly uninitialized variable
X-Git-Tag: v4.1.12-92~3^2~142
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c001e0231f88fb6623070b08e0f071b534ce93df;p=users%2Fjedix%2Flinux-maple.git

fm10k: prevent possibly uninitialized variable

If 'attr_flag < (1 << (2 * FM10K_TEST_MSG_NESTED))' is ever false, err
will be used uninitialized.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Orabug: 25394529
(cherry picked from commit c4114e3db6429c665adc3db871685c474a467efe)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
---

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
index 41d13414b4ae0..6d61201ad1929 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
@@ -941,7 +941,7 @@ static int fm10k_mbx_test(struct fm10k_intfc *interface, u64 *data)
 	struct fm10k_mbx_info *mbx = &hw->mbx;
 	u32 attr_flag, test_msg[6];
 	unsigned long timeout;
-	int err;
+	int err = -EINVAL;
 
 	/* For now this is a VF only feature */
 	if (hw->mac.type != fm10k_mac_vf)