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

Commit c2e4e25a authored by Thomas Meyer's avatar Thomas Meyer Committed by David S. Miller
Browse files

sfc: Use kcalloc instead of kzalloc to allocate array 

The advantage of kcalloc is, that will prevent integer overflows which could
result from the multiplication of number of elements and size and it is also
a bit nicer to read.

The semantic patch that makes this change is available
in https://lkml.org/lkml/2011/11/25/107



Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ddf98e6d

drivers/net/ethernet/sfc/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ int efx_probe_rx_queue(struct efx_rx_queue *rx_queue) 
		  rx_queue->ptr_mask);



	/* Allocate RX buffers */

	rx_queue->buffer = kzalloc(entries * sizeof(*rx_queue->buffer),

	rx_queue->buffer = kcalloc(entries, sizeof(*rx_queue->buffer),

				   GFP_KERNEL);

	if (!rx_queue->buffer)

		return -ENOMEM;

drivers/net/ethernet/sfc/selftest.c

+2 −2
Original line number Diff line number Diff line
@@ -503,8 +503,8 @@ efx_test_loopback(struct efx_tx_queue *tx_queue, 
		/* Determine how many packets to send */

		state->packet_count = efx->txq_entries / 3;

		state->packet_count = min(1 << (i << 2), state->packet_count);

		state->skbs = kzalloc(sizeof(state->skbs[0]) *

				      state->packet_count, GFP_KERNEL);

		state->skbs = kcalloc(state->packet_count,

				      sizeof(state->skbs[0]), GFP_KERNEL);

		if (!state->skbs)

			return -ENOMEM;

		state->flush = false;

drivers/net/ethernet/sfc/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ int efx_probe_tx_queue(struct efx_tx_queue *tx_queue) 
		  tx_queue->queue, efx->txq_entries, tx_queue->ptr_mask);



	/* Allocate software ring */

	tx_queue->buffer = kzalloc(entries * sizeof(*tx_queue->buffer),

	tx_queue->buffer = kcalloc(entries, sizeof(*tx_queue->buffer),

				   GFP_KERNEL);

	if (!tx_queue->buffer)

		return -ENOMEM;