Skip to content

Commit 04d91b7

Browse files
JuliaLawallmartinkpetersen
authored andcommitted
scsi: qla2xxx: 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-25-Julia.Lawall@inria.fr Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent b34c7dc commit 04d91b7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/scsi/qla2xxx/qla_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8434,7 +8434,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,
84348434
ql_dbg(ql_dbg_init, vha, 0x0163,
84358435
"-> fwdt%u template allocate template %#x words...\n",
84368436
j, risc_size);
8437-
fwdt->template = vmalloc(risc_size * sizeof(*dcode));
8437+
fwdt->template = vmalloc_array(risc_size, sizeof(*dcode));
84388438
if (!fwdt->template) {
84398439
ql_log(ql_log_warn, vha, 0x0164,
84408440
"-> fwdt%u failed allocate template.\n", j);
@@ -8689,7 +8689,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)
86898689
ql_dbg(ql_dbg_init, vha, 0x0173,
86908690
"-> fwdt%u template allocate template %#x words...\n",
86918691
j, risc_size);
8692-
fwdt->template = vmalloc(risc_size * sizeof(*dcode));
8692+
fwdt->template = vmalloc_array(risc_size, sizeof(*dcode));
86938693
if (!fwdt->template) {
86948694
ql_log(ql_log_warn, vha, 0x0174,
86958695
"-> fwdt%u failed allocate template.\n", j);

0 commit comments

Comments
 (0)