Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60cb8c4a authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman
Browse files

staging: mmal-vchiq: Fix client_component for 64 bit kernel 



[ Upstream commit 22e64b486adc4785542f8002c3af4c895490f841 ]

The MMAL client_component field is used with the event
mechanism to allow the client to identify the component for
which the event is generated.
The field is only 32bits in size, therefore we can't use a
pointer to the component in a 64 bit kernel.

Component handles are already held in an array per VCHI
instance, so use the array index as the client_component handle
to avoid having to create a new IDR for this purpose.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200629150945.10720-5-nsaenzjulienne@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: f37e76abd614 ("staging: vc04_services: fix information leak in create_component()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 48823cc0

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c

+7 −1
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ static int create_component(struct vchiq_mmal_instance *instance, 


	/* build component create message */

	m.h.type = MMAL_MSG_TYPE_COMPONENT_CREATE;

	m.u.component_create.client_component = (u32)(unsigned long)component;

	m.u.component_create.client_component = component->client_component;

	strncpy(m.u.component_create.name, name,

		sizeof(m.u.component_create.name));
@@ -1626,6 +1626,12 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance, 
		goto unlock;

	}



	/* We need a handle to reference back to our component structure.

	 * Use the array index in instance->component rather than rolling

	 * another IDR.

	 */

	component->client_component = idx;



	ret = create_component(instance, component, name);

	if (ret < 0)

		goto unlock;

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ struct vchiq_mmal_component { 
	struct vchiq_mmal_port input[MAX_PORT_COUNT]; /* input ports */

	struct vchiq_mmal_port output[MAX_PORT_COUNT]; /* output ports */

	struct vchiq_mmal_port clock[MAX_PORT_COUNT]; /* clock ports */

	u32 client_component;	/* Used to ref back to client struct */

};



int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance);