projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f0ce061
)
net/mlx4_core: Fix mem leak in SRIOV mlx4_init_one error flow
author
Jack Morgenstein
<
[email protected]
>
Tue, 27 Jan 2015 13:58:01 +0000
(15:58 +0200)
committer
David S. Miller
<
[email protected]
>
Wed, 28 Jan 2015 01:12:57 +0000
(17:12 -0800)
Structs allocated for the resource tracker must be freed in
the error flow.
Signed-off-by: Jack Morgenstein <
[email protected]
>
Signed-off-by: Amir Vadai <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/mellanox/mlx4/main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/mellanox/mlx4/main.c
b/drivers/net/ethernet/mellanox/mlx4/main.c
index 51d5550bc17a918701ab3ebd622104b7fbaae336..cc9f484392446e74543ded5a5626e40f518f1367 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/
drivers/net/ethernet/mellanox/mlx4/main.c
@@
-2979,8
+2979,10
@@
err_free_eq:
mlx4_free_eq_table(dev);
err_master_mfunc:
- if (mlx4_is_master(dev))
+ if (mlx4_is_master(dev)) {
+ mlx4_free_resource_tracker(dev, RES_TR_FREE_STRUCTS_ONLY);
mlx4_multi_func_cleanup(dev);
+ }
if (mlx4_is_slave(dev)) {
kfree(dev->caps.qp0_qkey);