diff options
| author | Kees Cook <kees@kernel.org> | 2026-02-20 23:49:23 -0800 |
|---|---|---|
| committer | Kees Cook <kees@kernel.org> | 2026-02-21 01:02:28 -0800 |
| commit | 69050f8d6d075dc01af7a5f2f550a8067510366f (patch) | |
| tree | bb265f94d9dfa7876c06a5d9f88673d496a15341 /drivers/tee/tee_core.c | |
| parent | d39a1d7486d98668dd34aaa6732aad7977c45f5a (diff) | |
| download | lwn-69050f8d6d075dc01af7a5f2f550a8067510366f.tar.gz lwn-69050f8d6d075dc01af7a5f2f550a8067510366f.zip | |
treewide: Replace kmalloc with kmalloc_obj for non-scalar types
This is the result of running the Coccinelle script from
scripts/coccinelle/api/kmalloc_objs.cocci. The script is designed to
avoid scalar types (which need careful case-by-case checking), and
instead replace kmalloc-family calls that allocate struct or union
object instances:
Single allocations: kmalloc(sizeof(TYPE), ...)
are replaced with: kmalloc_obj(TYPE, ...)
Array allocations: kmalloc_array(COUNT, sizeof(TYPE), ...)
are replaced with: kmalloc_objs(TYPE, COUNT, ...)
Flex array allocations: kmalloc(struct_size(PTR, FAM, COUNT), ...)
are replaced with: kmalloc_flex(*PTR, FAM, COUNT, ...)
(where TYPE may also be *VAR)
The resulting allocations no longer return "void *", instead returning
"TYPE *".
Signed-off-by: Kees Cook <kees@kernel.org>
Diffstat (limited to 'drivers/tee/tee_core.c')
| -rw-r--r-- | drivers/tee/tee_core.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 6c49e2e383c6..29df8cd1efd2 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -51,7 +51,7 @@ struct tee_context *teedev_open(struct tee_device *teedev) if (!tee_device_get(teedev)) return ERR_PTR(-EINVAL); - ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); + ctx = kzalloc_obj(*ctx, GFP_KERNEL); if (!ctx) { rc = -ENOMEM; goto err; @@ -560,8 +560,8 @@ static int tee_ioctl_open_session(struct tee_context *ctx, return -EINVAL; if (arg.num_params) { - params = kcalloc(arg.num_params, sizeof(struct tee_param), - GFP_KERNEL); + params = kzalloc_objs(struct tee_param, arg.num_params, + GFP_KERNEL); if (!params) return -ENOMEM; uparams = uarg->params; @@ -638,8 +638,8 @@ static int tee_ioctl_invoke(struct tee_context *ctx, return -EINVAL; if (arg.num_params) { - params = kcalloc(arg.num_params, sizeof(struct tee_param), - GFP_KERNEL); + params = kzalloc_objs(struct tee_param, arg.num_params, + GFP_KERNEL); if (!params) return -ENOMEM; uparams = uarg->params; @@ -699,8 +699,8 @@ static int tee_ioctl_object_invoke(struct tee_context *ctx, return -EINVAL; if (arg.num_params) { - params = kcalloc(arg.num_params, sizeof(struct tee_param), - GFP_KERNEL); + params = kzalloc_objs(struct tee_param, arg.num_params, + GFP_KERNEL); if (!params) return -ENOMEM; uparams = uarg->params; @@ -844,7 +844,7 @@ static int tee_ioctl_supp_recv(struct tee_context *ctx, if (size_add(sizeof(*uarg), TEE_IOCTL_PARAM_SIZE(num_params)) != buf.buf_len) return -EINVAL; - params = kcalloc(num_params, sizeof(struct tee_param), GFP_KERNEL); + params = kzalloc_objs(struct tee_param, num_params, GFP_KERNEL); if (!params) return -ENOMEM; @@ -958,7 +958,7 @@ static int tee_ioctl_supp_send(struct tee_context *ctx, if (size_add(sizeof(*uarg), TEE_IOCTL_PARAM_SIZE(num_params)) > buf.buf_len) return -EINVAL; - params = kcalloc(num_params, sizeof(struct tee_param), GFP_KERNEL); + params = kzalloc_objs(struct tee_param, num_params, GFP_KERNEL); if (!params) return -ENOMEM; @@ -1052,7 +1052,7 @@ struct tee_device *tee_device_alloc(const struct tee_desc *teedesc, !teedesc->ops->release) return ERR_PTR(-EINVAL); - teedev = kzalloc(sizeof(*teedev), GFP_KERNEL); + teedev = kzalloc_obj(*teedev, GFP_KERNEL); if (!teedev) { ret = ERR_PTR(-ENOMEM); goto err; |