Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: applespi - 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 touchpad_protocol {
...
struct tp_finger fingers[0];
};

Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.

So, replace the following form:

sizeof(*tp) + tp->number_of_fingers * sizeof(tp->fingers[0]);

with:

struct_size(tp, fingers, tp->number_of_fingers)

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

Gustavo A. R. Silva and committed by
Dmitry Torokhov
37ad2e34 c88090df

+1 -2
+1 -2
drivers/input/keyboard/applespi.c
··· 1494 1494 size_t tp_len; 1495 1495 1496 1496 tp = &message->touchpad; 1497 - tp_len = sizeof(*tp) + 1498 - tp->number_of_fingers * sizeof(tp->fingers[0]); 1497 + tp_len = struct_size(tp, fingers, tp->number_of_fingers); 1499 1498 1500 1499 if (le16_to_cpu(message->length) + 2 != tp_len) { 1501 1500 dev_warn_ratelimited(&applespi->spi->dev,