* [PATCH] binfmt_elf: Replace offsetof() with struct_size() in fill_note_info()
@ 2025-08-13 11:50 Xichao Zhao
2025-08-25 21:30 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Xichao Zhao @ 2025-08-13 11:50 UTC (permalink / raw)
To: viro, brauner, kees
Cc: jack, linux-fsdevel, linux-mm, linux-kernel, Xichao Zhao
When dealing with structures containing flexible arrays, struct_size()
provides additional compile-time checks compared to offsetof(). This
enhances code robustness and reduces the risk of potential errors.
Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
---
fs/binfmt_elf.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 264fba0d44bd..4aacf9c9cc2d 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1845,16 +1845,14 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
/*
* Allocate a structure for each thread.
*/
- info->thread = kzalloc(offsetof(struct elf_thread_core_info,
- notes[info->thread_notes]),
- GFP_KERNEL);
+ info->thread = kzalloc(struct_size(info->thread, notes, info->thread_notes),
+ GFP_KERNEL);
if (unlikely(!info->thread))
return 0;
info->thread->task = dump_task;
for (ct = dump_task->signal->core_state->dumper.next; ct; ct = ct->next) {
- t = kzalloc(offsetof(struct elf_thread_core_info,
- notes[info->thread_notes]),
+ t = kzalloc(struct_size(t, notes, info->thread_notes),
GFP_KERNEL);
if (unlikely(!t))
return 0;
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] binfmt_elf: Replace offsetof() with struct_size() in fill_note_info()
2025-08-13 11:50 [PATCH] binfmt_elf: Replace offsetof() with struct_size() in fill_note_info() Xichao Zhao
@ 2025-08-25 21:30 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2025-08-25 21:30 UTC (permalink / raw)
To: viro, brauner, Xichao Zhao
Cc: Kees Cook, jack, linux-fsdevel, linux-mm, linux-kernel
On Wed, 13 Aug 2025 19:50:58 +0800, Xichao Zhao wrote:
> When dealing with structures containing flexible arrays, struct_size()
> provides additional compile-time checks compared to offsetof(). This
> enhances code robustness and reduces the risk of potential errors.
>
>
Applied to for-next/execve, thanks!
[1/1] binfmt_elf: Replace offsetof() with struct_size() in fill_note_info()
https://git.kernel.org/kees/c/a728ce8ffbd2
Take care,
--
Kees Cook
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-08-25 21:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-13 11:50 [PATCH] binfmt_elf: Replace offsetof() with struct_size() in fill_note_info() Xichao Zhao
2025-08-25 21:30 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).