Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9893e742 authored by Julia Lawall's avatar Julia Lawall Committed by Roland Dreier
Browse files

IB/core: Use kmemdup() instead of kmalloc()+memcpy() 

Use kmemdup when some other buffer is immediately copied into the
allocated region.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/

)

// <smpl>
@@
expression from,to,size,flag;
statement S;
@@

-  to = \(kmalloc\|kzalloc\)(size,flag);
+  to = kmemdup(from,size,flag);
   if (to==NULL || ...) S
-  memcpy(to, from, size);
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 0eddb519

drivers/infiniband/core/cma.c

+2 −2
Original line number Diff line number Diff line
@@ -1677,13 +1677,13 @@ int rdma_set_ib_paths(struct rdma_cm_id *id, 
	if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ROUTE_RESOLVED))

		return -EINVAL;



	id->route.path_rec = kmalloc(sizeof *path_rec * num_paths, GFP_KERNEL);

	id->route.path_rec = kmemdup(path_rec, sizeof *path_rec * num_paths,

				     GFP_KERNEL);

	if (!id->route.path_rec) {

		ret = -ENOMEM;

		goto err;

	}



	memcpy(id->route.path_rec, path_rec, sizeof *path_rec * num_paths);

	id->route.num_paths = num_paths;

	return 0;

err:

drivers/infiniband/core/mad.c

+1 −3
Original line number Diff line number Diff line
@@ -291,13 +291,11 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, 
	}



	if (mad_reg_req) {

		reg_req = kmalloc(sizeof *reg_req, GFP_KERNEL);

		reg_req = kmemdup(mad_reg_req, sizeof *reg_req, GFP_KERNEL);

		if (!reg_req) {

			ret = ERR_PTR(-ENOMEM);

			goto error3;

		}

		/* Make a copy of the MAD registration request */

		memcpy(reg_req, mad_reg_req, sizeof *reg_req);

	}



	/* Now, fill in the various structures */