]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
soc: imx-scu: Align imx sc msg structs to 4
authorLeonard Crestez <leonard.crestez@nxp.com>
Thu, 20 Feb 2020 16:29:39 +0000 (18:29 +0200)
committerShawn Guo <shawnguo@kernel.org>
Mon, 24 Feb 2020 07:29:43 +0000 (15:29 +0800)
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.

Fix by marking with __aligned(4).

Fixes: 73feb4d0f8f1 ("soc: imx-scu: Add SoC UID(unique identifier) support")
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
drivers/soc/imx/soc-imx-scu.c

index fb70b8a3f7c523964e1aec543341638bf7929e36..20d37eaeb5f2cc3ae49845278359642254f850e2 100644 (file)
@@ -25,7 +25,7 @@ struct imx_sc_msg_misc_get_soc_id {
                        u32 id;
                } resp;
        } data;
-} __packed;
+} __packed __aligned(4);
 
 struct imx_sc_msg_misc_get_soc_uid {
        struct imx_sc_rpc_msg hdr;