Attachment 308786 Details for Bug 450645 – struct size fix

[patch] struct size fix

qla2xxx_rhel4.7_ioctl_structsize_patch11.txt (text/plain), 2.31 KB, created by Marcus Barrow on 2008-06-10 10:14:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Barrow

Created: 2008-06-10 10:14:01 UTC

Size: 2.31 KB

patch

obsolete

>
>BZ 450645 [2/11] several fixes: ioctl module and slab corruption
>
>Correct ISP84XX structure-size mismatch with API.
>
>Due to size-inconsistencies and 'union' usage used within the
>84XX API interface with EXIOCT, 84XX structures must be compiled
>with the 'packed' pragma in order to maintain member consistency.
>
>These changes are confined to the IOCTL module, except for a change to a comment
>in the driver. Support for the management applications is considered critical by
>our OEM's.
>
>
>---
> drivers/scsi/qla2xxx/inioct.h |   12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/scsi/qla2xxx/inioct.h b/drivers/scsi/qla2xxx/inioct.h
>index 5c5ef6b..cf4a2b1 100644
>--- a/drivers/scsi/qla2xxx/inioct.h
>+++ b/drivers/scsi/qla2xxx/inioct.h
>@@ -318,11 +318,11 @@ typedef struct _A84_RESET {
> 	USHORT Flags;
> 	USHORT Reserved;
> #define A84_RESET_FLAG_ENABLE_DIAG_FW   1
>-} A84_RESET, *PA84_RESET;
>+} __attribute__((packed)) A84_RESET, *PA84_RESET;
> 
> typedef struct _A84_GET_FW_VERSION {
> 	ULONG FwVersion;
>-} A84_GET_FW_VERSION, *PA84_GET_FW_VERSION;
>+} __attribute__((packed)) A84_GET_FW_VERSION, *PA84_GET_FW_VERSION;
> 
> typedef struct _A84_UPDATE_FW {
>         USHORT Flags;
>@@ -331,7 +331,7 @@ typedef struct _A84_UPDATE_FW {
> 	USHORT Reserved;
> 	ULONG  TotalByteCount;
> 	UINT64 pFwDataBytes;
>-} A84_UPDATE_FW, *PA84_UPDATE_FW;
>+} __attribute__((packed)) A84_UPDATE_FW, *PA84_UPDATE_FW;
> 
> typedef struct _A84_ACCESS_PARAMETERS {
> 	union {
>@@ -393,7 +393,7 @@ typedef struct _A84_ACCESS_PARAMETERS {
> 			ULONG Reserved;
> 		} Info; /* For fetch Info */
> 	} ap;
>-} A84_ACCESS_PARAMETERS, *PA84_ACCESS_PARAMETERS;
>+} __attribute__((packed)) A84_ACCESS_PARAMETERS, *PA84_ACCESS_PARAMETERS;
> 
> typedef struct _A84_MANAGE_INFO {
>         USHORT Operation;
>@@ -413,7 +413,7 @@ typedef struct _A84_MANAGE_INFO {
> #define INFO_DATA_TYPE_CONFIG_TBC          0x140
> 
> 	UINT64 pDataBytes;
>-} A84_MANAGE_INFO, *PA84_MANAGE_INFO;
>+} __attribute__((packed)) A84_MANAGE_INFO, *PA84_MANAGE_INFO;
> 
> #define A84_FC_CHECKSUM_FAILURE          0x01
> #define A84_FC_INVALID_LENGTH            0x02
>@@ -429,7 +429,7 @@ typedef struct _SD_A84_MGT{
> 		A84_UPDATE_FW      UpdateFw;
> 		A84_MANAGE_INFO    ManageInfo;
> 	} sp;
>-} SD_A84_MGT, *PSD_A84_MGT;
>+} __attribute__((packed)) SD_A84_MGT, *PSD_A84_MGT;
> 
> struct a84_mgmt_request {
> 	union {
>-- 
>1.4.4.1
>

Actions: View | Diff

Attachments on bug 450645: 308785 | 308786 | 308787 | 308788 | 308789 | 308790 | 308791 | 308792 | 308793 | 308794 | 308795