diff options
| author | Leonard Crestez <leonard.crestez@nxp.com> | 2020-02-20 18:29:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-12 13:00:28 +0100 |
| commit | 1bebf41fb8c12ad36f2217cdd810bfd76e7f282f (patch) | |
| tree | 154f428d3679fcd247fc011eb83289fde800637c /drivers/firmware | |
| parent | 67a6b0adb1ac01d9f13c4dc4ca52d047476a959f (diff) | |
| download | linux-stable-1bebf41fb8c12ad36f2217cdd810bfd76e7f282f.tar.gz linux-stable-1bebf41fb8c12ad36f2217cdd810bfd76e7f282f.tar.bz2 linux-stable-1bebf41fb8c12ad36f2217cdd810bfd76e7f282f.zip | |
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: 15e1f2bc8b3b ("firmware: imx: add misc svc support")
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/imx/misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firmware/imx/misc.c b/drivers/firmware/imx/misc.c index 4b56a587dacd..6a21ff942f82 100644 --- a/drivers/firmware/imx/misc.c +++ b/drivers/firmware/imx/misc.c @@ -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. |