mei: Cast the cb->ext_hdr allocation type
Subsystems (2)
PATCH 1/1 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.
---
Cc: Alexander Usyskin <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
--- drivers/misc/mei/interrupt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mei/interrupt.c +1 -1
@@ -133,7 +133,7 @@ static int mei_cl_irq_read_msg(struct mei_cl *cl,break ;case MEI_EXT_HDR_GSC : gsc_f2h = (struct mei_ext_hdr_gsc_f2h *)ext; - cb->ext_hdr =kzalloc (sizeof (*gsc_f2h),GFP_KERNEL ); + cb->ext_hdr = (struct mei_ext_hdr *)kzalloc (sizeof (*gsc_f2h),GFP_KERNEL );if (!cb->ext_hdr) { cb->status = -ENOMEM ; goto discard;
Signature · 1 line
2.34.1
Quoted 7 lines
Subject: [PATCH] mei: Cast the
cb->ext_hdrallocation typeIn 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.)
Quoted 6 lines
The assigned type is "struct
mei_ext_hdr*", but the returned type will be "structmei_ext_hdr_gsc_f2h*", which is a larger allocation size. This is by design as structmei_ext_hdr_gsc_f2hcontains structmei_ext_hdras its first member. Cast the allocation to the match the assignment.
Quoted 26 lines
Signed-off-by Kees Cook <[email protected]>---
Cc: Alexander Usyskin <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>--- drivers/misc/mei/interrupt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/misc/mei/interrupt.c +1
-1@@ -133,7 +133,7 @@ static int mei_cl_irq_read_msg(struct mei_cl *cl,break ;case MEI_EXT_HDR_GSC : gsc_f2h = (struct mei_ext_hdr_gsc_f2h *)ext; - cb->ext_hdr =kzalloc (sizeof (*gsc_f2h), GFP_KERNEL); + cb->ext_hdr = (struct mei_ext_hdr *)kzalloc (sizeof (*gsc_f2h),GFP_KERNEL );if (!cb->ext_hdr) {drivers/misc/mei/interrupt.c +0
-1cb->status = -ENOMEM ; goto discard; --2.34.1