ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am a1551e9b: Merge "Fix buffer overflow in syren utility"

Browse source 
* commit 'a1551e9b4c586d654224810100f15e8a46c64a7e':
  Fix buffer overflow in syren utility
This commit is contained in:
Colin Cross 2014-04-13 18:06:52 +00:00 • committed by Android Git Automerger
commit bf66e4486d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toolbox/syren.c
View file

@ -123,7 +123,11 @@ syren_main(int argc, char **argv)
r = find_reg(argv[2]); r = find_reg(argv[2]);
if (r == NULL) { if (r == NULL) {
strcpy(name, argv[2]); if(strlen(argv[2]) >= sizeof(name)){
fprintf(stderr, "REGNAME too long\n");
return 0;
}
strlcpy(name, argv[2], sizeof(name));
char *addr_str = strchr(argv[2], ':'); char *addr_str = strchr(argv[2], ':');
if (addr_str == NULL) if (addr_str == NULL)
return usage(); return usage();
@ -131,7 +135,7 @@ syren_main(int argc, char **argv)
sio.page = strtoul(argv[2], 0, 0); sio.page = strtoul(argv[2], 0, 0);
sio.addr = strtoul(addr_str, 0, 0); sio.addr = strtoul(addr_str, 0, 0);
} else { } else {
strcpy(name, r->name); strlcpy(name, r->name, sizeof(name));
sio.page = r->page; sio.page = r->page;
sio.addr = r->addr; sio.addr = r->addr;
} }