Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2405e8f6 authored by Byungho An's avatar Byungho An Committed by David S. Miller
Browse files

net: sxgbe: fix potential null dereference 



This fixes following:

drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c:1828 sxgbe_hw_init()
error: potential null dereference 'priv->hw'.  (kmalloc returns null)

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarByungho An <bh74.an@samsung.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40b92cad

drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c

+8 −2
Original line number Diff line number Diff line
@@ -2039,11 +2039,13 @@ static void sxgbe_get_ops(struct sxgbe_ops * const ops_ptr) 
 *  Description: this function checks the HW capability

 *  (if supported) and sets the driver's features.

 */

static void sxgbe_hw_init(struct sxgbe_priv_data * const priv)

static int sxgbe_hw_init(struct sxgbe_priv_data * const priv)

{

	u32 ctrl_ids;



	priv->hw = kmalloc(sizeof(*priv->hw), GFP_KERNEL);

	if(!priv->hw)

		return -ENOMEM;



	/* get the hardware ops */

	sxgbe_get_ops(priv->hw);
@@ -2064,6 +2066,8 @@ static void sxgbe_hw_init(struct sxgbe_priv_data * const priv) 


	if (priv->hw_cap.rx_csum_offload)

		pr_info("RX Checksum offload supported\n");



	return 0;

}



/**
@@ -2102,7 +2106,9 @@ struct sxgbe_priv_data *sxgbe_drv_probe(struct device *device, 
	sxgbe_verify_args();



	/* Init MAC and get the capabilities */

	sxgbe_hw_init(priv);

	ret = sxgbe_hw_init(priv);

	if (ret)

		goto error_free_netdev;



	/* allocate memory resources for Descriptor rings */

	ret = txring_mem_alloc(priv);