Commit 36dd73ee authored by Stefan Wahren's avatar Stefan Wahren Committed by Wen Zhiwei
Browse files

staging: vchiq_arm: Get the rid off struct vchiq_2835_state 

stable inclusion
from stable-v6.6.63
commit 6dee8f99c69068480e88121cbd38c267b0b60e08
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBI1RP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6dee8f99c69068480e88121cbd38c267b0b60e08



--------------------------------

[ Upstream commit 4e2766102da632f26341d5539519b0abf73df887 ]

The whole benefit of this encapsulating struct is questionable.
It just stores a flag to signalize the init state of vchiq_arm_state.
Beside the fact this flag is set too soon, the access to uninitialized
members should be avoided. So initialize vchiq_arm_state properly before
assign it directly to vchiq_state.

Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Link: https://lore.kernel.org/r/20240621131958.98208-6-wahrenst@gmx.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 404b739e8955 ("staging: vchiq_arm: Use devm_kzalloc() for vchiq_arm_state allocation")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent d0dcd5fb

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+6 −19
Original line number Diff line number Diff line
@@ -115,11 +115,6 @@ struct vchiq_arm_state { 
	int first_connect;

};



struct vchiq_2835_state {

	int inited;

	struct vchiq_arm_state arm_state;

};



struct vchiq_pagelist_info {

	struct pagelist *pagelist;

	size_t pagelist_buffer_size;
@@ -580,29 +575,21 @@ vchiq_arm_init_state(struct vchiq_state *state, 
int

vchiq_platform_init_state(struct vchiq_state *state)

{

	struct vchiq_2835_state *platform_state;

	struct vchiq_arm_state *platform_state;



	state->platform_state = kzalloc(sizeof(*platform_state), GFP_KERNEL);

	if (!state->platform_state)

	platform_state = kzalloc(sizeof(*platform_state), GFP_KERNEL);

	if (!platform_state)

		return -ENOMEM;



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



	platform_state->inited = 1;

	vchiq_arm_init_state(state, &platform_state->arm_state);

	vchiq_arm_init_state(state, platform_state);

	state->platform_state = (struct opaque_platform_state *)platform_state;



	return 0;

}



static struct vchiq_arm_state *vchiq_platform_get_arm_state(struct vchiq_state *state)

{

	struct vchiq_2835_state *platform_state;



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



	WARN_ON_ONCE(!platform_state->inited);



	return &platform_state->arm_state;

	return (struct vchiq_arm_state *)state->platform_state;

}



void