Skip to contentSkip to conversation

i40e: initialize params before notifying of l2_param_changes

PATCH New Jacob Keller 2 participants 3 messages Mar 20, 2017 – Mar 24, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i40e: initialize params before notifying of l2_param_changes

Probably due to some mis-merging fix a bug associated with commits d7ce6422d6e6 ("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().

---
 drivers/net/ethernet/intel/i40e/i40e_client.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_client.c +2 -0
index 191580ed946d..725017892f4f 100644
@@ -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(&params, &cdev->lan_info.params, sizeof(struct i40e_params));
 	cdev->client->ops->l2_param_change(&cdev->lan_info, cdev->client,
 					   &params);
Signature · 1 line
2.12.0.rc1.272.g5157a0d593b8
#1 lore raw

PATCH 1/1 i40e: initialize params before notifying of l2_param_changes

Quoted 23 lines

-----Original Message-----
From: Keller, Jacob E
Sent: Monday, March 20, 2017 4:46 PM
To: Intel Wired LAN <[email protected]>; Colin Ian King <[email protected]>
Cc: Keller, Jacob E <[email protected]>
Subject: [PATCH] i40e: initialize params before notifying of l2_param_changes

Probably due to some mis-merging fix a bug associated with commits d7ce6422d6e6 ("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.

Quoted 6 lines

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

---

Jeff,

This patch fixes a pretty serious bug with the i40e client interface and probably should be prioritized if possible.

Thanks,
Jake

Quoted 22 lines
 drivers/net/ethernet/intel/i40e/i40e_client.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_client.c +2 -0
index 191580ed946d..725017892f4f 100644
@@ -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(&params, &cdev->lan_info.params, sizeof(struct

i40e_params));

drivers/net/ethernet/intel/i40e/i40e_client.c +0 -1
 	cdev->client->ops->l2_param_change(&cdev->lan_info, cdev->client,
 					   &params);
--

2.12.0.rc1.272.g5157a0d593b8

#2 lore raw

PATCH 1/1 i40e: initialize params before notifying of l2_param_changes

In reply to Jacob Keller
Quoted 23 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Monday, March 20, 2017 4:46 PM
To: Intel Wired LAN <[email protected]>; Colin Ian King <[email protected]>
Subject: [Intel-wired-lan] [PATCH] i40e: initialize params before notifying of l2_param_changes

Probably due to some mis-merging fix a bug associated with commits d7ce6422d6e6 ("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.

Quoted 8 lines

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

---
 drivers/net/ethernet/intel/i40e/i40e_client.c | 2 ++
 1 file changed, 2 insertions(+)