Re: [PATCH] vc04_services: vchiq_arm: fix a NULL pointer dereference

From: Stefan Wahren
Date: Mon Mar 25 2019 - 05:16:24 EST


Hi Kangjie,

Am 24.03.19 um 23:43 schrieb Kangjie Lu:
> When kzalloc fails, "platform_state->inited = 1" is a NULL pointer
> dereference. The fix returns VCHIQ_ERROR in case it failed to
> avoid NULL pointer dereference.
>
> Signed-off-by: Kangjie Lu <kjlu@xxxxxxx>
please add a proper fixes tag.
> ---
> .../staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
> index dd4898861b83..0f12fe617575 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
> @@ -209,6 +209,8 @@ vchiq_platform_init_state(struct vchiq_state *state)
> struct vchiq_2835_state *platform_state;
>
> state->platform_state = kzalloc(sizeof(*platform_state), GFP_KERNEL);
> + if (!state->platform_state)
> + return VCHIQ_ERROR;

this change is good, but vchiq_init_state doesn't bail out immediately
in case vchiq_platform_init_state fails.

Could you please fix that, too?

Thanks Stefan

> platform_state = (struct vchiq_2835_state *)state->platform_state;
>
> platform_state->inited = 1;