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

Commit 9d89d9e6 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/pci: add extra padding to function measurement block 



Newer machines might use a different (larger) format for function
measurement blocks. To ensure that we comply with the alignment
requirement on these machines and prevent memory corruption (when
firmware writes more data than we expect) add 16 padding bytes
at the end of the fmb.

Cc: stable@vger.kernel.org # v4.1+
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent b707c65a

arch/s390/include/asm/pci.h

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ struct zpci_fmb { 
	u64 rpcit_ops;

	u64 dma_rbytes;

	u64 dma_wbytes;

} __packed __aligned(64);

	u64 pad[2];

} __packed __aligned(128);



enum zpci_state {

	ZPCI_FN_STATE_RESERVED,