aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/mellanox/mlxfw
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-06-14 13:41:52 +0300
committerDavid S. Miller <davem@davemloft.net>2017-06-14 15:32:18 -0400
commitf5165a5492237d33239176e7e171c7a8991583cb (patch)
tree1127e3d083244cfaae893fff9b16d3925fd55173 /drivers/net/ethernet/mellanox/mlxfw
parentnet: use skb_unref() in napi_consume_skb() (diff)
downloadlinux-dev-f5165a5492237d33239176e7e171c7a8991583cb.tar.xz
linux-dev-f5165a5492237d33239176e7e171c7a8991583cb.zip
net/mlxfw: fix a NULL dereference
If we hit this error path we end up returning ERR_PTR(0) which is NULL. The caller is not expecting that so it results in a NULL dereference. Fixes: 410ed13cae39 ("Add the mlxfw module for Mellanox firmware flash process") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Yotam Gigi <yotamg@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlxfw')
-rw-r--r--drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c
index 628150d28061..993cb5ba934e 100644
--- a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c
+++ b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c
@@ -594,6 +594,7 @@ mlxfw_mfa2_file_component_get(const struct mlxfw_mfa2_file *mfa2_file,
if (memcmp(comp_data->buff, mlxfw_mfa2_comp_magic,
mlxfw_mfa2_comp_magic_len) != 0) {
pr_err("Component has wrong magic\n");
+ err = -EINVAL;
goto err_out;
}