On Thu, Jun 11, 2020 at 10:17:33PM +0000, Saeed Mahameed wrote:
On Tue, 2020-06-09 at 19:45 +0200, Greg Kroah-Hartman wrote:
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This reverts commit 95fde2e46860c183f6f47a99381a3b9bff488bd5 which is
commit 9ca415399dae133b00273a4283ef31d003a6818d upstream.
It was backported incorrectly, Paul writes at:
https://lore.kernel.org/r/20200607203425.GD23662@xxxxxxxxxxxxx
I happened to notice this commit:
9ca415399dae - "net/mlx5: Annotate mutex destroy for root ns"
...was backported to 4.19 and 5.4 and v5.6 in linux-stable.
It patches del_sw_root_ns() - which only exists after v5.7-rc7
from:
6eb7a268a99b - "net/mlx5: Don't maintain a case of del_sw_func
being
null"
which creates the one line del_sw_root_ns stub function around
kfree(node) by breaking it out of tree_put_node().
In the absense of del_sw_root_ns - the backport finds an
identical one
line kfree stub fcn - named del_sw_prio from this earlier
commit:
139ed6c6c46a - "net/mlx5: Fix steering memory leak" [in v4.15-
rc5]
and then puts the mutex_destroy() into that (wrong) function,
instead of
putting it into tree_put_node where the root ns case used to be
hand
Reported-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Cc: Roi Dayan <roid@xxxxxxxxxxxx>
Cc: Mark Bloch <markb@xxxxxxxxxxxx>
Cc: Saeed Mahameed <saeedm@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Saeed Mahameed <saeedm@xxxxxxxxxxxx>
I don't know if this was due to something wrong in my backporting
process or AUTOSEL/wrong Fixes tag related. I will check later and will
try my best to avoid this in the future.
I'm not sure what happened there, but FWIW - AUTOSEL wasn't involved.
--
Thanks,
Sasha
