소스 검색

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: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Thomas Meyer 13 년 전
부모
커밋
c2e4e25afc
3개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      drivers/net/ethernet/sfc/rx.c
  2. 2 2
      drivers/net/ethernet/sfc/selftest.c
  3. 1 1
      drivers/net/ethernet/sfc/tx.c

+ 1 - 1
drivers/net/ethernet/sfc/rx.c

@@ -669,7 +669,7 @@ int efx_probe_rx_queue(struct efx_rx_queue *rx_queue)
 		  rx_queue->ptr_mask);
 		  rx_queue->ptr_mask);
 
 
 	/* Allocate RX buffers */
 	/* Allocate RX buffers */
-	rx_queue->buffer = kzalloc(entries * sizeof(*rx_queue->buffer),
+	rx_queue->buffer = kcalloc(entries, sizeof(*rx_queue->buffer),
 				   GFP_KERNEL);
 				   GFP_KERNEL);
 	if (!rx_queue->buffer)
 	if (!rx_queue->buffer)
 		return -ENOMEM;
 		return -ENOMEM;

+ 2 - 2
drivers/net/ethernet/sfc/selftest.c

@@ -503,8 +503,8 @@ efx_test_loopback(struct efx_tx_queue *tx_queue,
 		/* Determine how many packets to send */
 		/* Determine how many packets to send */
 		state->packet_count = efx->txq_entries / 3;
 		state->packet_count = efx->txq_entries / 3;
 		state->packet_count = min(1 << (i << 2), state->packet_count);
 		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)
 		if (!state->skbs)
 			return -ENOMEM;
 			return -ENOMEM;
 		state->flush = false;
 		state->flush = false;

+ 1 - 1
drivers/net/ethernet/sfc/tx.c

@@ -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);
 		  tx_queue->queue, efx->txq_entries, tx_queue->ptr_mask);
 
 
 	/* Allocate software ring */
 	/* Allocate software ring */
-	tx_queue->buffer = kzalloc(entries * sizeof(*tx_queue->buffer),
+	tx_queue->buffer = kcalloc(entries, sizeof(*tx_queue->buffer),
 				   GFP_KERNEL);
 				   GFP_KERNEL);
 	if (!tx_queue->buffer)
 	if (!tx_queue->buffer)
 		return -ENOMEM;
 		return -ENOMEM;