forked from mirrors/linux
		
	The kzalloc() function has a 2-factor argument form, kcalloc(). This
patch replaces cases of:
        kzalloc(a * b, gfp)
with:
        kcalloc(a * b, gfp)
as well as handling cases of:
        kzalloc(a * b * c, gfp)
with:
        kzalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
        kzalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
        kzalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
  kzalloc(
-	(sizeof(TYPE)) * E
+	sizeof(TYPE) * E
  , ...)
|
  kzalloc(
-	(sizeof(THING)) * E
+	sizeof(THING) * E
  , ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
  kzalloc(
-	sizeof(u8) * (COUNT)
+	COUNT
  , ...)
|
  kzalloc(
-	sizeof(__u8) * (COUNT)
+	COUNT
  , ...)
|
  kzalloc(
-	sizeof(char) * (COUNT)
+	COUNT
  , ...)
|
  kzalloc(
-	sizeof(unsigned char) * (COUNT)
+	COUNT
  , ...)
|
  kzalloc(
-	sizeof(u8) * COUNT
+	COUNT
  , ...)
|
  kzalloc(
-	sizeof(__u8) * COUNT
+	COUNT
  , ...)
|
  kzalloc(
-	sizeof(char) * COUNT
+	COUNT
  , ...)
|
  kzalloc(
-	sizeof(unsigned char) * COUNT
+	COUNT
  , ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kzalloc
+ kcalloc
  (
-	sizeof(TYPE) * (COUNT_ID)
+	COUNT_ID, sizeof(TYPE)
  , ...)
|
- kzalloc
+ kcalloc
  (
-	sizeof(TYPE) * COUNT_ID
+	COUNT_ID, sizeof(TYPE)
  , ...)
|
- kzalloc
+ kcalloc
  (
-	sizeof(TYPE) * (COUNT_CONST)
+	COUNT_CONST, sizeof(TYPE)
  , ...)
|
- kzalloc
+ kcalloc
  (
-	sizeof(TYPE) * COUNT_CONST
+	COUNT_CONST, sizeof(TYPE)
  , ...)
|
- kzalloc
+ kcalloc
  (
-	sizeof(THING) * (COUNT_ID)
+	COUNT_ID, sizeof(THING)
  , ...)
|
- kzalloc
+ kcalloc
  (
-	sizeof(THING) * COUNT_ID
+	COUNT_ID, sizeof(THING)
  , ...)
|
- kzalloc
+ kcalloc
  (
-	sizeof(THING) * (COUNT_CONST)
+	COUNT_CONST, sizeof(THING)
  , ...)
|
- kzalloc
+ kcalloc
  (
-	sizeof(THING) * COUNT_CONST
+	COUNT_CONST, sizeof(THING)
  , ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kzalloc
+ kcalloc
  (
-	SIZE * COUNT
+	COUNT, SIZE
  , ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
  kzalloc(
-	sizeof(TYPE) * (COUNT) * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kzalloc(
-	sizeof(TYPE) * (COUNT) * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kzalloc(
-	sizeof(TYPE) * COUNT * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kzalloc(
-	sizeof(TYPE) * COUNT * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kzalloc(
-	sizeof(THING) * (COUNT) * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kzalloc(
-	sizeof(THING) * (COUNT) * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kzalloc(
-	sizeof(THING) * COUNT * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kzalloc(
-	sizeof(THING) * COUNT * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
  kzalloc(
-	sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+	array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
  , ...)
|
  kzalloc(
-	sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
  , ...)
|
  kzalloc(
-	sizeof(THING1) * sizeof(THING2) * COUNT
+	array3_size(COUNT, sizeof(THING1), sizeof(THING2))
  , ...)
|
  kzalloc(
-	sizeof(THING1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(THING1), sizeof(THING2))
  , ...)
|
  kzalloc(
-	sizeof(TYPE1) * sizeof(THING2) * COUNT
+	array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
  , ...)
|
  kzalloc(
-	sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
  , ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
  kzalloc(
-	(COUNT) * STRIDE * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kzalloc(
-	COUNT * (STRIDE) * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kzalloc(
-	COUNT * STRIDE * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kzalloc(
-	(COUNT) * (STRIDE) * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kzalloc(
-	COUNT * (STRIDE) * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kzalloc(
-	(COUNT) * STRIDE * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kzalloc(
-	(COUNT) * (STRIDE) * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kzalloc(
-	COUNT * STRIDE * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
  kzalloc(C1 * C2 * C3, ...)
|
  kzalloc(
-	(E1) * E2 * E3
+	array3_size(E1, E2, E3)
  , ...)
|
  kzalloc(
-	(E1) * (E2) * E3
+	array3_size(E1, E2, E3)
  , ...)
|
  kzalloc(
-	(E1) * (E2) * (E3)
+	array3_size(E1, E2, E3)
  , ...)
|
  kzalloc(
-	E1 * E2 * E3
+	array3_size(E1, E2, E3)
  , ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
  kzalloc(sizeof(THING) * C2, ...)
|
  kzalloc(sizeof(TYPE) * C2, ...)
|
  kzalloc(C1 * C2 * C3, ...)
|
  kzalloc(C1 * C2, ...)
|
- kzalloc
+ kcalloc
  (
-	sizeof(TYPE) * (E2)
+	E2, sizeof(TYPE)
  , ...)
|
- kzalloc
+ kcalloc
  (
-	sizeof(TYPE) * E2
+	E2, sizeof(TYPE)
  , ...)
|
- kzalloc
+ kcalloc
  (
-	sizeof(THING) * (E2)
+	E2, sizeof(THING)
  , ...)
|
- kzalloc
+ kcalloc
  (
-	sizeof(THING) * E2
+	E2, sizeof(THING)
  , ...)
|
- kzalloc
+ kcalloc
  (
-	(E1) * E2
+	E1, E2
  , ...)
|
- kzalloc
+ kcalloc
  (
-	(E1) * (E2)
+	E1, E2
  , ...)
|
- kzalloc
+ kcalloc
  (
-	E1 * E2
+	E1, E2
  , ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
		
	
			
		
			
				
	
	
		
			305 lines
		
	
	
	
		
			7.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			305 lines
		
	
	
	
		
			7.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright 2014 Red Hat Inc.
 | 
						|
 *
 | 
						|
 * Permission is hereby granted, free of charge, to any person obtaining a
 | 
						|
 * copy of this software and associated documentation files (the "Software"),
 | 
						|
 * to deal in the Software without restriction, including without limitation
 | 
						|
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 | 
						|
 * and/or sell copies of the Software, and to permit persons to whom the
 | 
						|
 * Software is furnished to do so, subject to the following conditions:
 | 
						|
 *
 | 
						|
 * The above copyright notice and this permission notice shall be included in
 | 
						|
 * all copies or substantial portions of the Software.
 | 
						|
 *
 | 
						|
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 | 
						|
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 | 
						|
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 | 
						|
 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
 | 
						|
 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 | 
						|
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 | 
						|
 * OTHER DEALINGS IN THE SOFTWARE.
 | 
						|
 *
 | 
						|
 * Authors: Ben Skeggs <bskeggs@redhat.com>
 | 
						|
 */
 | 
						|
 | 
						|
#include <nvif/object.h>
 | 
						|
#include <nvif/client.h>
 | 
						|
#include <nvif/driver.h>
 | 
						|
#include <nvif/ioctl.h>
 | 
						|
 | 
						|
int
 | 
						|
nvif_object_ioctl(struct nvif_object *object, void *data, u32 size, void **hack)
 | 
						|
{
 | 
						|
	struct nvif_client *client = object->client;
 | 
						|
	union {
 | 
						|
		struct nvif_ioctl_v0 v0;
 | 
						|
	} *args = data;
 | 
						|
 | 
						|
	if (size >= sizeof(*args) && args->v0.version == 0) {
 | 
						|
		if (object != &client->object)
 | 
						|
			args->v0.object = nvif_handle(object);
 | 
						|
		else
 | 
						|
			args->v0.object = 0;
 | 
						|
		args->v0.owner = NVIF_IOCTL_V0_OWNER_ANY;
 | 
						|
	} else
 | 
						|
		return -ENOSYS;
 | 
						|
 | 
						|
	return client->driver->ioctl(client->object.priv, client->super,
 | 
						|
				     data, size, hack);
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
nvif_object_sclass_put(struct nvif_sclass **psclass)
 | 
						|
{
 | 
						|
	kfree(*psclass);
 | 
						|
	*psclass = NULL;
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
nvif_object_sclass_get(struct nvif_object *object, struct nvif_sclass **psclass)
 | 
						|
{
 | 
						|
	struct {
 | 
						|
		struct nvif_ioctl_v0 ioctl;
 | 
						|
		struct nvif_ioctl_sclass_v0 sclass;
 | 
						|
	} *args = NULL;
 | 
						|
	int ret, cnt = 0, i;
 | 
						|
	u32 size;
 | 
						|
 | 
						|
	while (1) {
 | 
						|
		size = sizeof(*args) + cnt * sizeof(args->sclass.oclass[0]);
 | 
						|
		if (!(args = kmalloc(size, GFP_KERNEL)))
 | 
						|
			return -ENOMEM;
 | 
						|
		args->ioctl.version = 0;
 | 
						|
		args->ioctl.type = NVIF_IOCTL_V0_SCLASS;
 | 
						|
		args->sclass.version = 0;
 | 
						|
		args->sclass.count = cnt;
 | 
						|
 | 
						|
		ret = nvif_object_ioctl(object, args, size, NULL);
 | 
						|
		if (ret == 0 && args->sclass.count <= cnt)
 | 
						|
			break;
 | 
						|
		cnt = args->sclass.count;
 | 
						|
		kfree(args);
 | 
						|
		if (ret != 0)
 | 
						|
			return ret;
 | 
						|
	}
 | 
						|
 | 
						|
	*psclass = kcalloc(args->sclass.count, sizeof(**psclass), GFP_KERNEL);
 | 
						|
	if (*psclass) {
 | 
						|
		for (i = 0; i < args->sclass.count; i++) {
 | 
						|
			(*psclass)[i].oclass = args->sclass.oclass[i].oclass;
 | 
						|
			(*psclass)[i].minver = args->sclass.oclass[i].minver;
 | 
						|
			(*psclass)[i].maxver = args->sclass.oclass[i].maxver;
 | 
						|
		}
 | 
						|
		ret = args->sclass.count;
 | 
						|
	} else {
 | 
						|
		ret = -ENOMEM;
 | 
						|
	}
 | 
						|
 | 
						|
	kfree(args);
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
 | 
						|
u32
 | 
						|
nvif_object_rd(struct nvif_object *object, int size, u64 addr)
 | 
						|
{
 | 
						|
	struct {
 | 
						|
		struct nvif_ioctl_v0 ioctl;
 | 
						|
		struct nvif_ioctl_rd_v0 rd;
 | 
						|
	} args = {
 | 
						|
		.ioctl.type = NVIF_IOCTL_V0_RD,
 | 
						|
		.rd.size = size,
 | 
						|
		.rd.addr = addr,
 | 
						|
	};
 | 
						|
	int ret = nvif_object_ioctl(object, &args, sizeof(args), NULL);
 | 
						|
	if (ret) {
 | 
						|
		/*XXX: warn? */
 | 
						|
		return 0;
 | 
						|
	}
 | 
						|
	return args.rd.data;
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
nvif_object_wr(struct nvif_object *object, int size, u64 addr, u32 data)
 | 
						|
{
 | 
						|
	struct {
 | 
						|
		struct nvif_ioctl_v0 ioctl;
 | 
						|
		struct nvif_ioctl_wr_v0 wr;
 | 
						|
	} args = {
 | 
						|
		.ioctl.type = NVIF_IOCTL_V0_WR,
 | 
						|
		.wr.size = size,
 | 
						|
		.wr.addr = addr,
 | 
						|
		.wr.data = data,
 | 
						|
	};
 | 
						|
	int ret = nvif_object_ioctl(object, &args, sizeof(args), NULL);
 | 
						|
	if (ret) {
 | 
						|
		/*XXX: warn? */
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
nvif_object_mthd(struct nvif_object *object, u32 mthd, void *data, u32 size)
 | 
						|
{
 | 
						|
	struct {
 | 
						|
		struct nvif_ioctl_v0 ioctl;
 | 
						|
		struct nvif_ioctl_mthd_v0 mthd;
 | 
						|
	} *args;
 | 
						|
	u8 stack[128];
 | 
						|
	int ret;
 | 
						|
 | 
						|
	if (sizeof(*args) + size > sizeof(stack)) {
 | 
						|
		if (!(args = kmalloc(sizeof(*args) + size, GFP_KERNEL)))
 | 
						|
			return -ENOMEM;
 | 
						|
	} else {
 | 
						|
		args = (void *)stack;
 | 
						|
	}
 | 
						|
	args->ioctl.version = 0;
 | 
						|
	args->ioctl.type = NVIF_IOCTL_V0_MTHD;
 | 
						|
	args->mthd.version = 0;
 | 
						|
	args->mthd.method = mthd;
 | 
						|
 | 
						|
	memcpy(args->mthd.data, data, size);
 | 
						|
	ret = nvif_object_ioctl(object, args, sizeof(*args) + size, NULL);
 | 
						|
	memcpy(data, args->mthd.data, size);
 | 
						|
	if (args != (void *)stack)
 | 
						|
		kfree(args);
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
nvif_object_unmap_handle(struct nvif_object *object)
 | 
						|
{
 | 
						|
	struct {
 | 
						|
		struct nvif_ioctl_v0 ioctl;
 | 
						|
		struct nvif_ioctl_unmap unmap;
 | 
						|
	} args = {
 | 
						|
		.ioctl.type = NVIF_IOCTL_V0_UNMAP,
 | 
						|
	};
 | 
						|
 | 
						|
	nvif_object_ioctl(object, &args, sizeof(args), NULL);
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
nvif_object_map_handle(struct nvif_object *object, void *argv, u32 argc,
 | 
						|
		       u64 *handle, u64 *length)
 | 
						|
{
 | 
						|
	struct {
 | 
						|
		struct nvif_ioctl_v0 ioctl;
 | 
						|
		struct nvif_ioctl_map_v0 map;
 | 
						|
	} *args;
 | 
						|
	u32 argn = sizeof(*args) + argc;
 | 
						|
	int ret, maptype;
 | 
						|
 | 
						|
	if (!(args = kzalloc(argn, GFP_KERNEL)))
 | 
						|
		return -ENOMEM;
 | 
						|
	args->ioctl.type = NVIF_IOCTL_V0_MAP;
 | 
						|
	memcpy(args->map.data, argv, argc);
 | 
						|
 | 
						|
	ret = nvif_object_ioctl(object, args, argn, NULL);
 | 
						|
	*handle = args->map.handle;
 | 
						|
	*length = args->map.length;
 | 
						|
	maptype = args->map.type;
 | 
						|
	kfree(args);
 | 
						|
	return ret ? ret : (maptype == NVIF_IOCTL_MAP_V0_IO);
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
nvif_object_unmap(struct nvif_object *object)
 | 
						|
{
 | 
						|
	struct nvif_client *client = object->client;
 | 
						|
	if (object->map.ptr) {
 | 
						|
		if (object->map.size) {
 | 
						|
			client->driver->unmap(client, object->map.ptr,
 | 
						|
						      object->map.size);
 | 
						|
			object->map.size = 0;
 | 
						|
		}
 | 
						|
		object->map.ptr = NULL;
 | 
						|
		nvif_object_unmap_handle(object);
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
nvif_object_map(struct nvif_object *object, void *argv, u32 argc)
 | 
						|
{
 | 
						|
	struct nvif_client *client = object->client;
 | 
						|
	u64 handle, length;
 | 
						|
	int ret = nvif_object_map_handle(object, argv, argc, &handle, &length);
 | 
						|
	if (ret >= 0) {
 | 
						|
		if (ret) {
 | 
						|
			object->map.ptr = client->driver->map(client,
 | 
						|
							      handle,
 | 
						|
							      length);
 | 
						|
			if (ret = -ENOMEM, object->map.ptr) {
 | 
						|
				object->map.size = length;
 | 
						|
				return 0;
 | 
						|
			}
 | 
						|
		} else {
 | 
						|
			object->map.ptr = (void *)(unsigned long)handle;
 | 
						|
			return 0;
 | 
						|
		}
 | 
						|
		nvif_object_unmap_handle(object);
 | 
						|
	}
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
nvif_object_fini(struct nvif_object *object)
 | 
						|
{
 | 
						|
	struct {
 | 
						|
		struct nvif_ioctl_v0 ioctl;
 | 
						|
		struct nvif_ioctl_del del;
 | 
						|
	} args = {
 | 
						|
		.ioctl.type = NVIF_IOCTL_V0_DEL,
 | 
						|
	};
 | 
						|
 | 
						|
	if (!object->client)
 | 
						|
		return;
 | 
						|
 | 
						|
	nvif_object_unmap(object);
 | 
						|
	nvif_object_ioctl(object, &args, sizeof(args), NULL);
 | 
						|
	object->client = NULL;
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
nvif_object_init(struct nvif_object *parent, u32 handle, s32 oclass,
 | 
						|
		 void *data, u32 size, struct nvif_object *object)
 | 
						|
{
 | 
						|
	struct {
 | 
						|
		struct nvif_ioctl_v0 ioctl;
 | 
						|
		struct nvif_ioctl_new_v0 new;
 | 
						|
	} *args;
 | 
						|
	int ret = 0;
 | 
						|
 | 
						|
	object->client = NULL;
 | 
						|
	object->handle = handle;
 | 
						|
	object->oclass = oclass;
 | 
						|
	object->map.ptr = NULL;
 | 
						|
	object->map.size = 0;
 | 
						|
 | 
						|
	if (parent) {
 | 
						|
		if (!(args = kmalloc(sizeof(*args) + size, GFP_KERNEL))) {
 | 
						|
			nvif_object_fini(object);
 | 
						|
			return -ENOMEM;
 | 
						|
		}
 | 
						|
 | 
						|
		args->ioctl.version = 0;
 | 
						|
		args->ioctl.type = NVIF_IOCTL_V0_NEW;
 | 
						|
		args->new.version = 0;
 | 
						|
		args->new.route = parent->client->route;
 | 
						|
		args->new.token = nvif_handle(object);
 | 
						|
		args->new.object = nvif_handle(object);
 | 
						|
		args->new.handle = handle;
 | 
						|
		args->new.oclass = oclass;
 | 
						|
 | 
						|
		memcpy(args->new.data, data, size);
 | 
						|
		ret = nvif_object_ioctl(parent, args, sizeof(*args) + size,
 | 
						|
					&object->priv);
 | 
						|
		memcpy(data, args->new.data, size);
 | 
						|
		kfree(args);
 | 
						|
		if (ret == 0)
 | 
						|
			object->client = parent->client;
 | 
						|
	}
 | 
						|
 | 
						|
	if (ret)
 | 
						|
		nvif_object_fini(object);
 | 
						|
	return ret;
 | 
						|
}
 |