net/mlxfw: Fix out-of-memory error in mfa2 flash burning
Subsystems (3)
PATCH 1/1 net/mlxfw: Fix out-of-memory error in mfa2 flash burning
From: Vladyslav Tarasiuk <[email protected]>
The burning process requires to perform internal allocations of large chunks of memory. This memory doesn't need to be contiguous and can be safely allocated by vzalloc() instead of kzalloc(). This patch changes such allocation to avoid possible out-of-memory failure.
--- drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c +4 -3
@@ -6,6 +6,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/netlink.h> +#include <linux/vmalloc.h> #include <linux/xz.h> #include "mlxfw_mfa2.h" #include "mlxfw_mfa2_file.h"
@@ -548,7 +549,7 @@ mlxfw_mfa2_file_component_get(const struct mlxfw_mfa2_file *mfa2_file, comp_size =be32_to_cpu (comp->size); comp_buf_size = comp_size + mlxfw_mfa2_comp_magic_len; - comp_data =kmalloc (sizeof (*comp_data) + comp_buf_size,GFP_KERNEL ); + comp_data =vzalloc (sizeof (*comp_data) + comp_buf_size);if (!comp_data)return ERR_PTR (-ENOMEM ); comp_data->comp.data_size = comp_size;
@@ -570,7 +571,7 @@ mlxfw_mfa2_file_component_get(const struct mlxfw_mfa2_file *mfa2_file, comp_data->comp.data = comp_data->buff + mlxfw_mfa2_comp_magic_len;return &comp_data->comp; err_out: -kfree (comp_data); +vfree (comp_data);return ERR_PTR (err); }
@@ -579,7 +580,7 @@ void mlxfw_mfa2_file_component_put(struct mlxfw_mfa2_component *comp)const struct mlxfw_mfa2_comp_data *comp_data; comp_data = container_of(comp, struct mlxfw_mfa2_comp_data, comp); -kfree (comp_data); +vfree (comp_data); }void mlxfw_mfa2_file_fini (struct mlxfw_mfa2_file *mfa2_file)
--
2.20.1
Quoted 11 lines · Leon Romanovsky
From: Vladyslav Tarasiuk <[email protected]>
The burning process requires to perform internal allocations of large chunks of memory. This memory doesn't need to be contiguous and can be safely allocated by
vzalloc()instead ofkzalloc(). This patch changes such allocation to avoid possible out-of-memory failure.Fixes 410ed13cae39 ("Add the mlxfw module for Mellanox firmware flash process")Signed-off-by Vladyslav Tarasiuk <[email protected]>Reviewed-by Aya Levin <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>
David Miller
maintainerFrom: Leon Romanovsky <[email protected]>
Date: Thu, 26 Dec 2019 10:41:56 +0200
Quoted 11 lines
From: Vladyslav Tarasiuk <[email protected]>
The burning process requires to perform internal allocations of large chunks of memory. This memory doesn't need to be contiguous and can be safely allocated by
vzalloc()instead ofkzalloc(). This patch changes such allocation to avoid possible out-of-memory failure.Fixes 410ed13cae39 ("Add the mlxfw module for Mellanox firmware flash process")Signed-off-by Vladyslav Tarasiuk <[email protected]>Reviewed-by Aya Levin <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>
Applied and queued up for -stable, thank you.