xhci: Use struct_size() in kzalloc()

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;
    void *entry[];
};

instance = kzalloc(sizeof(struct foo) + sizeof(void *) * count, GFP_KERNEL);

Instead of leaving these open-coded and prone to type mistakes, we can now
use the new struct_size() helper:

instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL);

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gustavo A. R. Silva 2019-01-08 09:40:46 -06:00 коммит произвёл Greg Kroah-Hartman
Родитель 8eb58994dd
Коммит da79ff6e58
1 изменённых файлов: 1 добавлений и 2 удалений

Просмотреть файл

@ -1455,8 +1455,7 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag
else else
num_tds = 1; num_tds = 1;
urb_priv = kzalloc(sizeof(struct urb_priv) + urb_priv = kzalloc(struct_size(urb_priv, td, num_tds), mem_flags);
num_tds * sizeof(struct xhci_td), mem_flags);
if (!urb_priv) if (!urb_priv)
return -ENOMEM; return -ENOMEM;