diff options
| author | Tyrel Datwyler | 2013-08-15 07:23:47 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2013-08-27 06:45:12 +0200 |
| commit | d0ef440350ff9d1c72e52c837302df090c4d2725 (patch) | |
| tree | 5f6fe3807334f31db85c066d9a4ad2f47cb88b05 /arch/powerpc | |
| parent | powerpc/pseries: Fix over writing of rtas return code in update_dt_node (diff) | |
| download | kernel-qcow2-linux-d0ef440350ff9d1c72e52c837302df090c4d2725.tar.gz kernel-qcow2-linux-d0ef440350ff9d1c72e52c837302df090c4d2725.tar.xz kernel-qcow2-linux-d0ef440350ff9d1c72e52c837302df090c4d2725.zip | |
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 { u32 state; u64 reserved; u32 nprops; -}; +} __packed; #define NODE_ACTION_MASK 0xff000000 #define NODE_COUNT_MASK 0x00ffffff |