]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ionic: use vmalloc_array and vcalloc
authorJulia Lawall <Julia.Lawall@inria.fr>
Tue, 27 Jun 2023 14:43:26 +0000 (16:43 +0200)
committerJakub Kicinski <kuba@kernel.org>
Tue, 27 Jun 2023 16:30:23 +0000 (09:30 -0700)
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>
drivers/net/ethernet/pensando/ionic/ionic_lif.c

index 6ccc1ea91992f1992e046a31f5216dd121f9c61b..7c20a44e549b1be896fcea9869e9e8e65ae0adfa 100644 (file)
@@ -561,7 +561,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type,
        new->q.dev = dev;
        new->flags = flags;
 
-       new->q.info = vzalloc(num_descs * sizeof(*new->q.info));
+       new->q.info = vcalloc(num_descs, sizeof(*new->q.info));
        if (!new->q.info) {
                netdev_err(lif->netdev, "Cannot allocate queue info\n");
                err = -ENOMEM;
@@ -582,7 +582,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type,
        if (err)
                goto err_out;
 
-       new->cq.info = vzalloc(num_descs * sizeof(*new->cq.info));
+       new->cq.info = vcalloc(num_descs, sizeof(*new->cq.info));
        if (!new->cq.info) {
                netdev_err(lif->netdev, "Cannot allocate completion queue info\n");
                err = -ENOMEM;