summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Morey-Chaisemartin2009-04-21 19:11:06 +0200
committerRoland Dreier2009-04-21 19:11:06 +0200
commit5bf0da7dd0ae193e072412519cba1d77b6196c61 (patch)
tree6d995cda8a563dacfd734cb1fb2395e83c08559f
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf... (diff)
downloadkernel-qcow2-linux-5bf0da7dd0ae193e072412519cba1d77b6196c61.tar.gz
kernel-qcow2-linux-5bf0da7dd0ae193e072412519cba1d77b6196c61.tar.xz
kernel-qcow2-linux-5bf0da7dd0ae193e072412519cba1d77b6196c61.zip
mlx4_core: Fix memory leak in mlx4_enable_msi_x()
When the msi_x option is enabled but pci_enable_msix() fails (not enough vectors are available etc), the entries array was not freed on the error path. Signed-off-by: Nicolas Morey-Chaisemartin <nicolas.morey-chaisemartin@ext.bull.net> Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/net/mlx4/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 102bac90a302..30bea9689694 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -976,7 +976,7 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
nreq = err;
goto retry;
}
-
+ kfree(entries);
goto no_msi;
}