ibmvnic: Free rwi on reset success
Nick Child
reviewerPATCH 1/1 ibmvnic: Free rwi on reset success
Free the rwi structure in the event that the last rwi in the list processed successfully. The logic in commit 4f408e1fa6e1 ("ibmvnic:
retry reset if there are no other resets") introduces an issue that results in a 32 byte memory leak whenever the last rwi in the list gets processed.
--- drivers/net/ethernet/ibm/ibmvnic.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +8 -8
@@ -3007,19 +3007,19 @@ static void __ibmvnic_reset(struct work_struct *work) rwi =get_next_rwi (adapter);/* -* If there is another reset queued, free the previous rwi -* and process the new reset even if previous reset failed -* (the previous reset could have failed because of a fail -* over for instance, so process the fail over). -* * If there are no resets queued and the previous reset failed, * the adapter would be in an undefined state. So retry the * previous reset as a hard reset. +* +* Else, free the previous rwi and, if there is another reset +* queued, process the new reset even if previous reset failed +* (the previous reset could have failed because of a fail +* over for instance, so process the fail over). */ -if (rwi) -kfree (tmprwi); -else if (rc) +if (!rwi && rc) rwi = tmprwi; +else +kfree (tmprwi);if (rwi && (rwi->reset_reason ==VNIC_RESET_FAILOVER || rwi->reset_reason ==VNIC_RESET_MOBILITY || rc))
Signature · 1 line
2.31.1
Jakub Kicinski
maintainerQuoted 1 line · On Mon, 17 Oct 2022 10:15:16 -0500 Nick Child wrote:
Subject: [PATCH net-next] ibmvnic: Free rwi on reset success
Why net-next? it's a fix, right? it should go to Linus in the current release cycle, i.e. the next -rc release.
Please make sure to CC the authors of the change under Fixes, and the maintainers of the driver. ./scripts/get_maintainer is your friend.
Quoted 8 lines
Free the rwi structure in the event that the last rwi in the list processed successfully. The logic in commit
4f408e1fa6e1("ibmvnic:
retry reset if there are no other resets") introduces an issue that results in a 32 byte memory leak whenever the last rwi in the list gets processed.Fixes 4f408e1fa6e1 ("ibmvnic: retry reset if there are no other resets")Signed-off-by Nick Child <[email protected]>
Nick Child
reviewerHello Jakub,
Thanks for the review.
Quoted 5 lines · Jakub Kicinski
Quoted 1 line · On Mon, 17 Oct 2022 10:15:16 -0500 Nick Child wrote:
Subject: [PATCH net-next] ibmvnic: Free rwi on reset success
Why net-next? it's a fix, right? it should go to Linus in the current release cycle, i.e. the next -rc release.
Apologies, I must have misunderstood when to use net vs net-next. The bug has been around since v5.14 so I did not want to clutter net inbox with things not directly relevant to v6.1. Would you like me to resend with the net tag?
Quoted 2 lines
Please make sure to CC the authors of the change under Fixes, and the maintainers of the driver.
./scripts/get_maintaineris your friend.
The ibmvnic list of maintainers is due for an update. I have added the current team to the CC list. We will have a patch out soon to update MAINTAINERS.
Thanks again. Apologies for any confusion,
Nick Child
Jakub Kicinski
maintainerQuoted 11 lines · On Tue, 18 Oct 2022 15:01:13 -0500 Nick Child wrote:
Quoted 5 lines · Jakub Kicinski
Quoted 1 line · On Mon, 17 Oct 2022 10:15:16 -0500 Nick Child wrote:
Subject: [PATCH net-next] ibmvnic: Free rwi on reset success
Why net-next? it's a fix, right? it should go to Linus in the current release cycle, i.e. the next -rc release.
Apologies, I must have misunderstood when to use net vs net-next. The bug has been around since v5.14 so I did not want to clutter net inbox with things not directly relevant to v6.1. Would you like me to resend with the
nettag?
Yes, anything that's a fix for code which is already present in net should go to net. It will then make it to Linus within a week, and Greg KH & co. can pick it up for stable trees (like 5.14) some time later.
Quoted 6 lines
Quoted 2 lines
Please make sure to CC the authors of the change under Fixes, and the maintainers of the driver.
./scripts/get_maintaineris your friend.The ibmvnic list of maintainers is due for an update. I have added the current team to the CC list. We will have a patch out soon to update
MAINTAINERS.
I figured that may be the case, if it's not a problem I'd CC everyone even if you know some of the addresses will bounce. Removes the need for us to manually check why people aren't CCed.
BTW when you send the update to MAINTAINERS please target net as well, MAINTAINERS updates are fast-tracked like fixes.