diff mbox series

[v2,14/24] RDMA/siw: use vmalloc_array and vcalloc

Message ID	20230627144339.144478-15-Julia.Lawall@inria.fr
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Julia Lawall <Julia.Lawall@inria.fr> To: Bernard Metzler <bmt@zurich.ibm.com> Cc: kernel-janitors@vger.kernel.org, keescook@chromium.org, christophe.jaillet@wanadoo.fr, kuba@kernel.org, Jason Gunthorpe <jgg@ziepe.ca>, Leon Romanovsky <leon@kernel.org>, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 14/24] RDMA/siw: use vmalloc_array and vcalloc Date: Tue, 27 Jun 2023 16:43:29 +0200 Message-Id: <20230627144339.144478-15-Julia.Lawall@inria.fr> In-Reply-To: <20230627144339.144478-1-Julia.Lawall@inria.fr> References: <20230627144339.144478-1-Julia.Lawall@inria.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	use vmalloc_array and vcalloc \| [v2,00/24] use vmalloc_array and vcalloc [v2,01/24] lib/test_vmalloc.c: use vmalloc_array and vcalloc [v2,02/24] octeon_ep: use vmalloc_array and vcalloc [v2,03/24] drm/gud: use vmalloc_array and vcalloc [v2,04/24] gve: use vmalloc_array and vcalloc [v2,05/24] RDMA/erdma: use vmalloc_array and vcalloc [v2,06/24] dma-buf: system_heap: use vmalloc_array and vcalloc [v2,07/24] scsi: fnic: use vmalloc_array and vcalloc [v2,08/24] virtio-mem: use vmalloc_array and vcalloc [v2,09/24] pds_core: use vmalloc_array and vcalloc [v2,10/24] bus: mhi: host: use vmalloc_array and vcalloc [v2,11/24] ionic: use vmalloc_array and vcalloc [v2,12/24] btrfs: zoned: use vmalloc_array and vcalloc [v2,13/24] iommu/tegra: gart: use vmalloc_array and vcalloc [v2,14/24] RDMA/siw: use vmalloc_array and vcalloc [v2,15/24] habanalabs: use vmalloc_array and vcalloc [v2,16/24] drm/i915/gvt: use vmalloc_array and vcalloc [v2,17/24] kcov: use vmalloc_array and vcalloc [v2,18/24] net: enetc: use vmalloc_array and vcalloc [v2,19/24] RDMA/bnxt_re: use vmalloc_array and vcalloc [v2,20/24] comedi: use vmalloc_array and vcalloc [v2,21/24] x86/sgx: use vmalloc_array and vcalloc [v2,22/24] net: mana: use vmalloc_array and vcalloc [v2,23/24] vduse: use vmalloc_array and vcalloc [v2,24/24] scsi: qla2xxx: use vmalloc_array and vcalloc

Commit Message

Julia Lawall June 27, 2023, 2:43 p.m. UTC

  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>

---
v2: Use vmalloc_array and vcalloc instead of array_size.
This also leaves a multiplication of a constant by a sizeof
as is.  Two patches are thus dropped from the series.

 drivers/infiniband/sw/siw/siw_qp.c    |    4 ++--
 drivers/infiniband/sw/siw/siw_verbs.c |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff -u -p a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/siw/siw_verbs.c
--- a/drivers/infiniband/sw/siw/siw_verbs.c
+++ b/drivers/infiniband/sw/siw/siw_verbs.c
@@ -381,7 +381,7 @@  int siw_create_qp(struct ib_qp *ibqp, st
 	if (udata)
 		qp->sendq = vmalloc_user(num_sqe * sizeof(struct siw_sqe));
 	else
-		qp->sendq = vzalloc(num_sqe * sizeof(struct siw_sqe));
+		qp->sendq = vcalloc(num_sqe, sizeof(struct siw_sqe));
 
 	if (qp->sendq == NULL) {
 		rv = -ENOMEM;
@@ -414,7 +414,7 @@  int siw_create_qp(struct ib_qp *ibqp, st
 			qp->recvq =
 				vmalloc_user(num_rqe * sizeof(struct siw_rqe));
 		else
-			qp->recvq = vzalloc(num_rqe * sizeof(struct siw_rqe));
+			qp->recvq = vcalloc(num_rqe, sizeof(struct siw_rqe));
 
 		if (qp->recvq == NULL) {
 			rv = -ENOMEM;
@@ -1624,7 +1624,7 @@  int siw_create_srq(struct ib_srq *base_s
 		srq->recvq =
 			vmalloc_user(srq->num_rqe * sizeof(struct siw_rqe));
 	else
-		srq->recvq = vzalloc(srq->num_rqe * sizeof(struct siw_rqe));
+		srq->recvq = vcalloc(srq->num_rqe, sizeof(struct siw_rqe));
 
 	if (srq->recvq == NULL) {
 		rv = -ENOMEM;
diff -u -p a/drivers/infiniband/sw/siw/siw_qp.c b/drivers/infiniband/sw/siw/siw_qp.c
--- a/drivers/infiniband/sw/siw/siw_qp.c
+++ b/drivers/infiniband/sw/siw/siw_qp.c
@@ -204,7 +204,7 @@  static int siw_qp_readq_init(struct siw_
 {
 	if (irq_size) {
 		irq_size = roundup_pow_of_two(irq_size);
-		qp->irq = vzalloc(irq_size * sizeof(struct siw_sqe));
+		qp->irq = vcalloc(irq_size, sizeof(struct siw_sqe));
 		if (!qp->irq) {
 			qp->attrs.irq_size = 0;
 			return -ENOMEM;
@@ -212,7 +212,7 @@  static int siw_qp_readq_init(struct siw_
 	}
 	if (orq_size) {
 		orq_size = roundup_pow_of_two(orq_size);
-		qp->orq = vzalloc(orq_size * sizeof(struct siw_sqe));
+		qp->orq = vcalloc(orq_size, sizeof(struct siw_sqe));
 		if (!qp->orq) {
 			qp->attrs.orq_size = 0;
 			qp->attrs.irq_size = 0;