Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/pseries: Correct buffer parsing in update_dt_node()

Browse Source 
Correct parsing of the buffer returned from ibm,update-properties. The first
element is a length and the path to the property which is slightly different
from the list of properties in the buffer so we need to specifically
handle this.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Nathan Fontenot 2013-04-24 05:49:36 +00:00 committed by Benjamin Herrenschmidt
parent 762ec15707
commit 2e9b7b02a3
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/powerpc/platforms/pseries/mobility.c
View File

@ -134,6 +134,7 @@ static int update_dt_node(u32 phandle, s32 scope)
char *prop_data;
char *rtas_buf;
int update_properties_token;
u32 vd;
update_properties_token = rtas_token("ibm,update-properties");
if (update_properties_token == RTAS_UNKNOWN_SERVICE)
@ -160,13 +161,24 @@ static int update_dt_node(u32 phandle, s32 scope)
prop_data = rtas_buf + sizeof(*upwa);
for (i = 0; i < upwa->nprops; i++) {
char *prop_name;
u32 vd;
prop_name = prop_data + 1;
prop_data += strlen(prop_name) + 1;
/* The first element of the buffer is the path of the node
* being updated in the form of a 8 byte string length
* followed by the string. Skip past this to get to the
* properties being updated.
*/
vd = *prop_data++;
prop_data += vd;
/* The path we skipped over is counted as one of the elements
* returned so start counting at one.
*/
for (i = 1; i < upwa->nprops; i++) {
char *prop_name;
prop_name = prop_data;
prop_data += strlen(prop_name) + 1;
vd = *(u32 *)prop_data;
prop_data += sizeof(vd);
switch (vd) {
case 0x00000000: