Skip to content

Commit f712c82

Browse files
JuliaLawallkuba-moo
authored andcommitted
ionic: use vmalloc_array and vcalloc
Use vmalloc_array and vcalloc to protect against multiplication overflows. The changes were done using the following Coccinelle semantic patch: // <smpl> @initialize:ocaml@ @@ let rename alloc = match alloc with "vmalloc" -> "vmalloc_array" | "vzalloc" -> "vcalloc" | _ -> failwith "unknown" @@ size_t e1,e2; constant C1, C2; expression E1, E2, COUNT, x1, x2, x3; typedef u8; typedef __u8; type t = {u8,__u8,char,unsigned char}; identifier alloc = {vmalloc,vzalloc}; fresh identifier realloc = script:ocaml(alloc) { rename alloc }; @@ ( alloc(x1*x2*x3) | alloc(C1 * C2) | alloc((sizeof(t)) * (COUNT), ...) | - alloc((e1) * (e2)) + realloc(e1, e2) | - alloc((e1) * (COUNT)) + realloc(COUNT, e1) | - alloc((E1) * (E2)) + realloc(E1, E2) ) // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr> Link: https://lore.kernel.org/r/20230627144339.144478-12-Julia.Lawall@inria.fr Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 906a76c commit f712c82

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/net/ethernet/pensando/ionic/ionic_lif.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type,
561561
new->q.dev = dev;
562562
new->flags = flags;
563563

564-
new->q.info = vzalloc(num_descs * sizeof(*new->q.info));
564+
new->q.info = vcalloc(num_descs, sizeof(*new->q.info));
565565
if (!new->q.info) {
566566
netdev_err(lif->netdev, "Cannot allocate queue info\n");
567567
err = -ENOMEM;
@@ -582,7 +582,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type,
582582
if (err)
583583
goto err_out;
584584

585-
new->cq.info = vzalloc(num_descs * sizeof(*new->cq.info));
585+
new->cq.info = vcalloc(num_descs, sizeof(*new->cq.info));
586586
if (!new->cq.info) {
587587
netdev_err(lif->netdev, "Cannot allocate completion queue info\n");
588588
err = -ENOMEM;

0 commit comments

Comments
 (0)