diff options
| author | Ruan Jinjie <ruanjinjie@huawei.com> | 2023-07-25 19:54:24 +0000 |
|---|---|---|
| committer | Masami Hiramatsu (Google) <mhiramat@kernel.org> | 2023-08-23 09:38:17 +0900 |
| commit | 8865aea0471c512c2d94220c60a0083cefcb9348 (patch) | |
| tree | 86c315d91079f1adce6d931dab76d3b870764d2e /kernel/kprobes.c | |
| parent | 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 (diff) | |
| download | linux-stable-8865aea0471c512c2d94220c60a0083cefcb9348.tar.gz linux-stable-8865aea0471c512c2d94220c60a0083cefcb9348.tar.bz2 linux-stable-8865aea0471c512c2d94220c60a0083cefcb9348.zip | |
kernel: kprobes: Use struct_size()
Use struct_size() instead of hand-writing it, when allocating a structure
with a flex array.
This is less verbose.
Link: https://lore.kernel.org/all/20230725195424.3469242-1-ruanjinjie@huawei.com/
Signed-off-by: Ruan Jinjie <ruanjinjie@huawei.com>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Diffstat (limited to 'kernel/kprobes.c')
| -rw-r--r-- | kernel/kprobes.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index ca385b61d546..0c6185aefaef 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -2232,8 +2232,7 @@ int register_kretprobe(struct kretprobe *rp) return -ENOMEM; for (i = 0; i < rp->maxactive; i++) { - inst = kzalloc(sizeof(struct kretprobe_instance) + - rp->data_size, GFP_KERNEL); + inst = kzalloc(struct_size(inst, data, rp->data_size), GFP_KERNEL); if (inst == NULL) { rethook_free(rp->rh); rp->rh = NULL; @@ -2256,8 +2255,7 @@ int register_kretprobe(struct kretprobe *rp) rp->rph->rp = rp; for (i = 0; i < rp->maxactive; i++) { - inst = kzalloc(sizeof(struct kretprobe_instance) + - rp->data_size, GFP_KERNEL); + inst = kzalloc(struct_size(inst, data, rp->data_size), GFP_KERNEL); if (inst == NULL) { refcount_set(&rp->rph->ref, i); free_rp_inst(rp); |