Skip to content

Commit 09f9adb

Browse files
keesgregkh
authored andcommitted
mei: Cast the cb->ext_hdr allocation type
In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.) The assigned type is "struct mei_ext_hdr *", but the returned type will be "struct mei_ext_hdr_gsc_f2h *", which is a larger allocation size. This is by design as struct mei_ext_hdr_gsc_f2h contains struct mei_ext_hdr as its first member. Cast the allocation to the match the assignment. Signed-off-by: Kees Cook <kees@kernel.org> Acked-by: Alexander Usyskin <alexander.usyskin@intel.com> Link: https://lore.kernel.org/r/20250426061815.work.435-kees@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1281f0a commit 09f9adb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/misc/mei/interrupt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static int mei_cl_irq_read_msg(struct mei_cl *cl,
133133
break;
134134
case MEI_EXT_HDR_GSC:
135135
gsc_f2h = (struct mei_ext_hdr_gsc_f2h *)ext;
136-
cb->ext_hdr = kzalloc(sizeof(*gsc_f2h), GFP_KERNEL);
136+
cb->ext_hdr = (struct mei_ext_hdr *)kzalloc(sizeof(*gsc_f2h), GFP_KERNEL);
137137
if (!cb->ext_hdr) {
138138
cb->status = -ENOMEM;
139139
goto discard;

0 commit comments

Comments
 (0)