diff mbox

[xenial/master-next,1/1] s390/pci: add extra padding to function measurement block

Message ID 1461150693-2585-2-git-send-email-apw@canonical.com
State New
Headers show

Commit Message

Andy Whitcroft April 20, 2016, 11:11 a.m. UTC 
From: Sebastian Ott <sebott@linux.vnet.ibm.com>

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: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

(cherry picked from commit 9d89d9e61d361f3adb75e1aebe4bb367faf16cfa)
BugLink: http://bugs.launchpad.net/bugs/1572291
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 arch/s390/include/asm/pci.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index f833082d..31558c6 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -45,7 +45,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,