diff options
author | Tyrel Datwyler <tyreld@linux.vnet.ibm.com> | 2013-08-15 01:23:47 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-27 00:45:12 -0400 |
commit | d0ef440350ff9d1c72e52c837302df090c4d2725 (patch) | |
tree | 5f6fe3807334f31db85c066d9a4ad2f47cb88b05 /arch/powerpc | |
parent | 638a405fb52cfb2e7f559e869dd0291420b9e84d (diff) |
powerpc/pseries: Pack update_props_workarea to map correctly to rtas buffer header
The work area buffer returned by the ibm,update-properties rtas call contains
20 bytes of header information prior to the property value descriptor data.
Currently update_dt_node tries to advance over this header using sizeof(upwa).
The update_props_workarea struct contains 20 bytes worth of fields, that map
to the relevant header data, but the sizeof the structure is 24 bytes due to
4 bytes of padding at the end of the structure. Packing the structure ensures
that we don't advance too far over the rtas buffer.
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Acked-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/platforms/pseries/mobility.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c index aaae85de08fb..023e35470760 100644 --- a/arch/powerpc/platforms/pseries/mobility.c +++ b/arch/powerpc/platforms/pseries/mobility.c | |||
@@ -28,7 +28,7 @@ struct update_props_workarea { | |||
28 | u32 state; | 28 | u32 state; |
29 | u64 reserved; | 29 | u64 reserved; |
30 | u32 nprops; | 30 | u32 nprops; |
31 | }; | 31 | } __packed; |
32 | 32 | ||
33 | #define NODE_ACTION_MASK 0xff000000 | 33 | #define NODE_ACTION_MASK 0xff000000 |
34 | #define NODE_COUNT_MASK 0x00ffffff | 34 | #define NODE_COUNT_MASK 0x00ffffff |