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

Commit 1bebf41f authored by Leonard Crestez's avatar Leonard Crestez Committed by Greg Kroah-Hartman
Browse files

firmware: imx: misc: Align imx sc msg structs to 4 



commit 1e6a4eba693ac72e6f91b4252458c933110e5f4c upstream.

The imx SC api strongly assumes that messages are composed out of
4-bytes words but some of our message structs have odd sizeofs.

This produces many oopses with CONFIG_KASAN=y:

    BUG: KASAN: stack-out-of-bounds in imx_mu_send_data+0x108/0x1f0

It shouldn't cause an issues in normal use because these structs are
always allocated on the stack.

Fixes: 15e1f2bc ("firmware: imx: add misc svc support")
Signed-off-by: default avatarLeonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67a6b0ad

drivers/firmware/imx/misc.c

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct imx_sc_msg_req_misc_set_ctrl { 
	u32 ctrl;

	u32 val;

	u16 resource;

} __packed;

} __packed __aligned(4);



struct imx_sc_msg_req_cpu_start {

	struct imx_sc_rpc_msg hdr;
@@ -30,12 +30,12 @@ struct imx_sc_msg_req_misc_get_ctrl { 
	struct imx_sc_rpc_msg hdr;

	u32 ctrl;

	u16 resource;

} __packed;

} __packed __aligned(4);



struct imx_sc_msg_resp_misc_get_ctrl {

	struct imx_sc_rpc_msg hdr;

	u32 val;

} __packed;

} __packed __aligned(4);



/*

 * This function sets a miscellaneous control value.