treewide: Replace kmalloc with kmalloc_obj for non-scalar types

This is the result of running the Coccinelle script from
scripts/coccinelle/api/kmalloc_objs.cocci. The script is designed to
avoid scalar types (which need careful case-by-case checking), and
instead replace kmalloc-family calls that allocate struct or union
object instances:

Single allocations:	kmalloc(sizeof(TYPE), ...)
are replaced with:	kmalloc_obj(TYPE, ...)

Array allocations:	kmalloc_array(COUNT, sizeof(TYPE), ...)
are replaced with:	kmalloc_objs(TYPE, COUNT, ...)

Flex array allocations:	kmalloc(struct_size(PTR, FAM, COUNT), ...)
are replaced with:	kmalloc_flex(*PTR, FAM, COUNT, ...)

(where TYPE may also be *VAR)

The resulting allocations no longer return "void *", instead returning
"TYPE *".

Signed-off-by: Kees Cook <kees@kernel.org>

5 files changed, 11 insertions, 12 deletions

diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
index 168707213ed9..15b0060ce62d 100644
--- a/drivers/usb/cdns3/cdns3-gadget.c
+++ b/drivers/usb/cdns3/cdns3-gadget.c
@@ -903,7 +903,7 @@ static int cdns3_prepare_aligned_request_buf(struct cdns3_request *priv_req)
 	buf = priv_req->aligned_buf;
 
 	if (!buf || priv_req->request.length > buf->size) {
-		buf = kzalloc(sizeof(*buf), GFP_ATOMIC);
+		buf = kzalloc_obj(*buf, GFP_ATOMIC);
 		if (!buf)
 			return -ENOMEM;
 
@@ -2315,7 +2315,7 @@ struct usb_request *cdns3_gadget_ep_alloc_request(struct usb_ep *ep,
 	struct cdns3_endpoint *priv_ep = ep_to_cdns3_ep(ep);
 	struct cdns3_request *priv_req;
 
-	priv_req = kzalloc(sizeof(*priv_req), gfp_flags);
+	priv_req = kzalloc_obj(*priv_req, gfp_flags);
 	if (!priv_req)
 		return NULL;
 
@@ -3287,7 +3287,7 @@ static int cdns3_gadget_start(struct cdns *cdns)
 	u32 max_speed;
 	int ret;
 
-	priv_dev = kzalloc(sizeof(*priv_dev), GFP_KERNEL);
+	priv_dev = kzalloc_obj(*priv_dev, GFP_KERNEL);
 	if (!priv_dev)
 		return -ENOMEM;
 
diff --git a/drivers/usb/cdns3/cdns3-pci-wrap.c b/drivers/usb/cdns3/cdns3-pci-wrap.c
index 57f57c24c663..03c9762ad032 100644
--- a/drivers/usb/cdns3/cdns3-pci-wrap.c
+++ b/drivers/usb/cdns3/cdns3-pci-wrap.c
@@ -97,7 +97,7 @@ static int cdns3_pci_probe(struct pci_dev *pdev,
 	if (pci_is_enabled(func)) {
 		wrap = pci_get_drvdata(func);
 	} else {
-		wrap = kzalloc(sizeof(*wrap), GFP_KERNEL);
+		wrap = kzalloc_obj(*wrap, GFP_KERNEL);
 		if (!wrap)
 			return -ENOMEM;
 	}
diff --git a/drivers/usb/cdns3/cdnsp-gadget.c b/drivers/usb/cdns3/cdnsp-gadget.c
index d37c29a253dd..475ac61ad4c4 100644
--- a/drivers/usb/cdns3/cdnsp-gadget.c
+++ b/drivers/usb/cdns3/cdnsp-gadget.c
@@ -1102,7 +1102,7 @@ static struct usb_request *cdnsp_gadget_ep_alloc_request(struct usb_ep *ep,
 	struct cdnsp_ep *pep = to_cdnsp_ep(ep);
 	struct cdnsp_request *preq;
 
-	preq = kzalloc(sizeof(*preq), gfp_flags);
+	preq = kzalloc_obj(*preq, gfp_flags);
 	if (!preq)
 		return NULL;
 
@@ -1905,7 +1905,7 @@ static int __cdnsp_gadget_init(struct cdns *cdns)
 
 	cdns_drd_gadget_on(cdns);
 
-	pdev = kzalloc(sizeof(*pdev), GFP_KERNEL);
+	pdev = kzalloc_obj(*pdev, GFP_KERNEL);
 	if (!pdev)
 		return -ENOMEM;
 
diff --git a/drivers/usb/cdns3/cdnsp-mem.c b/drivers/usb/cdns3/cdnsp-mem.c
index 97866bfb2da9..a2a1b21f2ef8 100644
--- a/drivers/usb/cdns3/cdnsp-mem.c
+++ b/drivers/usb/cdns3/cdnsp-mem.c
@@ -35,7 +35,7 @@ static struct cdnsp_segment *cdnsp_segment_alloc(struct cdnsp_device *pdev,
 	dma_addr_t dma;
 	int i;
 
-	seg = kzalloc(sizeof(*seg), flags);
+	seg = kzalloc_obj(*seg, flags);
 	if (!seg)
 		return NULL;
 
@@ -376,7 +376,7 @@ static struct cdnsp_ring *cdnsp_ring_alloc(struct cdnsp_device *pdev,
 	struct cdnsp_ring *ring;
 	int ret;
 
-	ring = kzalloc(sizeof *(ring), flags);
+	ring = kzalloc_obj(*(ring), flags);
 	if (!ring)
 		return NULL;
 
@@ -575,9 +575,8 @@ int cdnsp_alloc_stream_info(struct cdnsp_device *pdev,
 	stream_info->num_stream_ctxs = num_stream_ctxs;
 
 	/* Initialize the array of virtual pointers to stream rings. */
-	stream_info->stream_rings = kcalloc(num_streams,
-					    sizeof(struct cdnsp_ring *),
-					    GFP_ATOMIC);
+	stream_info->stream_rings = kzalloc_objs(struct cdnsp_ring *,
+						 num_streams, GFP_ATOMIC);
 	if (!stream_info->stream_rings)
 		return -ENOMEM;
 
diff --git a/drivers/usb/cdns3/cdnsp-pci.c b/drivers/usb/cdns3/cdnsp-pci.c
index 5e7b88ca8b96..b6199f98ff77 100644
--- a/drivers/usb/cdns3/cdnsp-pci.c
+++ b/drivers/usb/cdns3/cdnsp-pci.c
@@ -82,7 +82,7 @@ static int cdnsp_pci_probe(struct pci_dev *pdev,
 	if (pci_is_enabled(func)) {
 		cdnsp = pci_get_drvdata(func);
 	} else {
-		cdnsp = kzalloc(sizeof(*cdnsp), GFP_KERNEL);
+		cdnsp = kzalloc_obj(*cdnsp, GFP_KERNEL);
 		if (!cdnsp) {
 			ret = -ENOMEM;
 			goto put_pci;