Commit 7be147dc authored Mar 20, 2017 by Jacob Keller Committed by Jeff Kirsher Mar 27, 2017

i40e: initialize params before notifying of l2_param_changes



Probably due to some mis-merging fix a bug associated with commits
d7ce6422 ("i40e: don't check params until after checking for client
instance", 2017-02-09) and 3140aa9a78c9 ("i40e: KISS the client
interface", 2017-03-14)

The first commit tried to move the initialization of the params
structure so that we didn't bother doing this if we didn't have a client
interface. You can already see that it looks fishy because of the
indentation. The second commit refactors a bunch of the interface, and
incorrectly drops the params initialization.

I believe what occurred is that internally the two patches were
re-ordered, and the merge conflicts as a result were performed
incorrectly.

Fix the use of an uninitialized variable by correctly initializing the
params variable via i40e_client_get_params().

Reported-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 703ba885

drivers/net/ethernet/intel/i40e/i40e_client.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,8 @@ void i40e_notify_client_of_l2_param_changes(struct i40e_vsi *vsi)
		dev_dbg(&vsi->back->pdev->dev, "Client is not open, abort l2 param change\n");
		return;
		}
		memset(&params, 0, sizeof(params));
		i40e_client_get_params(vsi, &params);
		memcpy(&cdev->lan_info.params, &params, sizeof(struct i40e_params));
		cdev->client->ops->l2_param_change(&cdev->lan_info, cdev->client,
		&params);