diff mbox series

[1/2] libertas: Add missing __packed annotation with struct_group()

Message ID 20211201173234.578124-2-keescook@chromium.org (mailing list archive)
State Accepted
Commit 978090ae8856edbf4d01d0c1f2103831da25f04c
Delegated to: Kalle Valo
Headers show
Series libertas: Add missing __packed annotations | expand

Commit Message

Kees Cook Dec. 1, 2021, 5:32 p.m. UTC
Build testing of the newly added struct_group() usage missed smaller
architecture width tests for changes to pahole output. Add the missed
__packed annotation with struct_group() usage in a __packed struct.

Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/linux-mm/202111302102.apaePz2J-lkp@intel.com
Fixes: 5fd32ae0433a ("libertas: Use struct_group() for memcpy() region")
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 drivers/net/wireless/marvell/libertas/host.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kalle Valo Dec. 8, 2021, 6:40 p.m. UTC | #1
Kees Cook <keescook@chromium.org> wrote:

> Build testing of the newly added struct_group() usage missed smaller
> architecture width tests for changes to pahole output. Add the missed
> __packed annotation with struct_group() usage in a __packed struct.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Link: https://lore.kernel.org/linux-mm/202111302102.apaePz2J-lkp@intel.com
> Fixes: 5fd32ae0433a ("libertas: Use struct_group() for memcpy() region")
> Signed-off-by: Kees Cook <keescook@chromium.org>

2 patches applied to wireless-drivers-next.git, thanks.

978090ae8856 libertas: Add missing __packed annotation with struct_group()
05db148ee9a7 libertas_tf: Add missing __packed annotations
diff mbox series

Patch

diff --git a/drivers/net/wireless/marvell/libertas/host.h b/drivers/net/wireless/marvell/libertas/host.h
index af96bdba3b2b..ceff4b92e7a1 100644
--- a/drivers/net/wireless/marvell/libertas/host.h
+++ b/drivers/net/wireless/marvell/libertas/host.h
@@ -308,7 +308,7 @@  struct txpd {
 	__le32 tx_packet_location;
 	/* Tx packet length */
 	__le16 tx_packet_length;
-	struct_group(tx_dest_addr,
+	struct_group_attr(tx_dest_addr, __packed,
 		/* First 2 byte of destination MAC address */
 		u8 tx_dest_addr_high[2];
 		/* Last 4 byte of destination MAC address */