Skip to content

Commit ede481f

Browse files
keeshdeller
authored andcommitted
fbdev: arkfb: Cast ics5342_init() 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 dac_info *" but the returned type will be "struct ics5342_info *", which has a larger allocation size. This is by design, as struct ics5342_info contains struct dac_info as its first member. (patch slightly modified by Helge Deller) Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent 34fe05c commit ede481f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/video/fbdev/arkfb.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,9 +431,10 @@ static struct dac_ops ics5342_ops = {
431431

432432
static struct dac_info * ics5342_init(dac_read_regs_t drr, dac_write_regs_t dwr, void *data)
433433
{
434-
struct dac_info *info = kzalloc(sizeof(struct ics5342_info), GFP_KERNEL);
434+
struct ics5342_info *ics_info = kzalloc(sizeof(struct ics5342_info), GFP_KERNEL);
435+
struct dac_info *info = &ics_info->dac;
435436

436-
if (! info)
437+
if (!ics_info)
437438
return NULL;
438439

439440
info->dacops = &ics5342_ops;

0 commit comments

Comments
 (0)