igb: use struct_size() helper
Subsystems (3)
PATCH 1/1 igb: use struct_size() helper
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example:
struct foo {
int stuff;
struct boo entry[];
};size = sizeof(struct foo) + count * sizeof(struct boo); instance = alloc(size, GFP_KERNEL);
Instead of leaving these open-coded and prone to type mistakes, we can now use the new struct_size() helper:
size = struct_size(instance, entry, count);
This code was detected with the help of Coccinelle.
--- drivers/net/ethernet/intel/igb/igb_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +3 -3
@@ -1189,15 +1189,15 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter, {struct igb_q_vector *q_vector;struct igb_ring *ring; -int ring_count, size; +int ring_count; +size_t size;/* igb only supports 1 Tx and/or 1 Rx queue per vector */ if (txr_count >1 || rxr_count >1 )return -ENOMEM ; ring_count = txr_count + rxr_count; - size =sizeof (struct igb_q_vector ) + - (sizeof (struct igb_ring ) * ring_count); + size =struct_size (q_vector, ring, ring_count);/* allocate q_vector and rings */ q_vector = adapter->q_vector[v_idx];
Signature · 1 line
2.20.1
From: "Gustavo A. R. Silva" <[email protected]>
Date: Thu, 7 Feb 2019 22:15:40 -0600
Quoted 12 lines
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example:
struct foo { int stuff; struct boo entry[]; };size = sizeof(struct foo) + count * sizeof(struct boo); instance =
alloc(size, GFP_KERNEL);
Quoted 8 lines
Instead of leaving these open-coded and prone to type mistakes, we can now use the new
struct_size()helper:size =
struct_size(instance, entry, count);This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Applied.