summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656/int.h
diff options
context:
space:
mode:
authorBen Hutchings2013-01-14 02:29:17 +0100
committerGreg Kroah-Hartman2013-01-17 22:08:32 +0100
commit1ee4c55fc9620451b2a825d793042a7e0775391b (patch)
tree7d1d6688d96c6c0b12699a24e8ffce843cfb09db /drivers/staging/vt6656/int.h
parentstaging: zram: fix invalid memory references during disk write (diff)
downloadkernel-qcow2-linux-1ee4c55fc9620451b2a825d793042a7e0775391b.tar.gz
kernel-qcow2-linux-1ee4c55fc9620451b2a825d793042a7e0775391b.tar.xz
kernel-qcow2-linux-1ee4c55fc9620451b2a825d793042a7e0775391b.zip
staging: vt6656: Fix inconsistent structure packing
vt6656 has several headers that use the #pragma pack(1) directive to enable structure packing, but never disable it. The layout of structures defined in other headers can then depend on which order the various headers are included in, breaking the One Definition Rule. In practice this resulted in crashes on x86_64 until the order of header inclusion was changed for some files in commit 11d404cb56ecd ('staging: vt6656: fix headers and add cfg80211.'). But we need a proper fix that won't be affected by future changes to the order of inclusion. This removes the #pragma pack(1) directives and adds __packed to the structure definitions for which packing appears to have been intended. Reported-and-tested-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/int.h')
-rw-r--r--drivers/staging/vt6656/int.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h
index 5d8faf9f96ec..e0d2b07ba608 100644
--- a/drivers/staging/vt6656/int.h
+++ b/drivers/staging/vt6656/int.h
@@ -34,7 +34,6 @@
#include "device.h"
/*--------------------- Export Definitions -------------------------*/
-#pragma pack(1)
typedef struct tagSINTData {
BYTE byTSR0;
BYTE byPkt0;