qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

part: rkparm: fix issue when find the last part 

The 'next' will be NULL if next ',' is not found, and access to
'*next' will end with "Synchronous Abort" in 64 bit system because
the memory space is reserved for Trust area.

Change-Id: Id8ee9d6f7815977d7c5996d67a3b72feb74d00cf
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Kever Yang 2018-05-02 16:35:15 +08:00
parent 0fa03761e7
commit a7de8a5ca7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
disk/part_rkparm.c
View File

@ -33,7 +33,7 @@ static int rkparm_param_parse(char *param, struct list_head *parts_head,
{ {
struct rkparm_part *part; struct rkparm_part *part;
const char *cmdline = strstr(param, "CMDLINE:"); const char *cmdline = strstr(param, "CMDLINE:");
const char *blkdev_parts, *blkdev_def; const char *blkdev_parts;
char *cmdline_end, *next, *pend; char *cmdline_end, *next, *pend;
int len, offset = 0; int len, offset = 0;
unsigned long size, start; unsigned long size, start;
@ -44,8 +44,7 @@ static int rkparm_param_parse(char *param, struct list_head *parts_head,
} }
blkdev_parts = strstr(cmdline, "mtdparts"); blkdev_parts = strstr(cmdline, "mtdparts");
blkdev_def = strchr(blkdev_parts, ':') + 1; next = strchr(blkdev_parts, ':');
next = (char *)blkdev_def;
cmdline_end = strstr(cmdline, "\n"); /* end by '\n' */ cmdline_end = strstr(cmdline, "\n"); /* end by '\n' */
*cmdline_end = '\0'; *cmdline_end = '\0';
/* skip "CMDLINE:" */ /* skip "CMDLINE:" */
@ -57,13 +56,16 @@ static int rkparm_param_parse(char *param, struct list_head *parts_head,
*/ */
env_delete("bootargs", "initrd="); env_delete("bootargs", "initrd=");
while (*next) { while (next) {
/* Skip ':' and ',' */
next++;
if (*next == '-') { if (*next == '-') {
size = (~0UL); size = (~0UL);
next++; next++;
} else { } else {
size = simple_strtoul(next, &next, 16); size = simple_strtoul(next, &next, 16);
} }
/* Skip '@' */
next++; next++;
start = simple_strtoul(next, &next, 16); start = simple_strtoul(next, &next, 16);
next++; next++;
@ -82,9 +84,8 @@ static int rkparm_param_parse(char *param, struct list_head *parts_head,
part->size = size; part->size = size;
strncpy(part->name, next, len); strncpy(part->name, next, len);
part->name[len] = '\0'; part->name[len] = '\0';
next = strchr(next, ',');
next++;
list_add_tail(&part->node, parts_head); list_add_tail(&part->node, parts_head);
next = strchr(next, ',');
} }
return 0; return 0;