Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

Switch the bootinfo-loader over to using strncasecmp rather than strcasecmp which should be much safer on binary buffersi of

Browse Source 
unknown content/length.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>


git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@722 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Mark Cave-Ayland
2010-04-02 08:33:07 +00:00
committed by Mark Cave-Ayland
parent 41dd5272ca
commit 7fdf25e044
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/libc/string.h
View File

@@ -52,6 +52,7 @@ extern void *memchr(const void *s, int c, size_t n);
extern char *strdup( const char *str ); extern char *strdup( const char *str );
extern int strcasecmp( const char *cs, const char *ct ); extern int strcasecmp( const char *cs, const char *ct );
extern int strncasecmp( const char *cs, const char *ct, size_t count );
extern char *strncpy_nopad( char *dest, const char *src, size_t n ); extern char *strncpy_nopad( char *dest, const char *src, size_t n );

15
libc/string.c
View File

@@ -511,3 +511,18 @@ strcasecmp( const char *cs, const char *ct )
} }
return __res; return __res;
} }
int
strncasecmp( const char *cs, const char *ct, size_t count )
{
register signed char __res;
while (count--) {
char ch1 = toupper(*cs), ch2 = toupper(*ct);
ct++;
if ((__res = ch1 - ch2) != 0 || !*cs++)
break;
}
return __res;
}

22
packages/bootinfo-loader.c
View File

@@ -167,13 +167,13 @@ bootinfo_loader_init_program( void *dummy )
} else if (c == '>') { } else if (c == '>') {
tag = 0; tag = 0;
tagbuf[taglen] = '\0'; tagbuf[taglen] = '\0';
if (strcasecmp(tagbuf, "chrp-boot") == 0) { if (strncasecmp(tagbuf, "chrp-boot", 9) == 0) {
chrp = 1; chrp = 1;
} else if (chrp == 1) { } else if (chrp == 1) {
if (strcasecmp(tagbuf, "boot-script") == 0) { if (strncasecmp(tagbuf, "boot-script", 11) == 0) {
script = 1; script = 1;
scriptlen = 0; scriptlen = 0;
} else if (strcasecmp(tagbuf, "/boot-script") == 0) { } else if (strncasecmp(tagbuf, "/boot-script", 12) == 0) {
script = 0; script = 0;
bootscript[scriptlen] = '\0'; bootscript[scriptlen] = '\0';
@@ -184,7 +184,7 @@ bootinfo_loader_init_program( void *dummy )
feval("-1 state-valid !"); feval("-1 state-valid !");
break; break;
} else if (strcasecmp(tagbuf, "/chrp-boot") == 0) } else if (strncasecmp(tagbuf, "/chrp-boot", 10) == 0)
break; break;
} }
} else if (tag && taglen < sizeof(tagbuf)) { } else if (tag && taglen < sizeof(tagbuf)) {
@@ -195,26 +195,26 @@ bootinfo_loader_init_program( void *dummy )
} else if (entity && c ==';') { } else if (entity && c ==';') {
entity = 0; entity = 0;
tagbuf[taglen] = '\0'; tagbuf[taglen] = '\0';
if (strcasecmp(tagbuf, "lt") == 0) { if (strncasecmp(tagbuf, "lt", 2) == 0) {
bootscript[scriptlen++] = '<'; bootscript[scriptlen++] = '<';
} else if (strcasecmp(tagbuf, "gt") == 0) { } else if (strncasecmp(tagbuf, "gt", 2) == 0) {
bootscript[scriptlen++] = '>'; bootscript[scriptlen++] = '>';
} else if (strcasecmp(tagbuf, "device") == 0) { } else if (strncasecmp(tagbuf, "device", 6) == 0) {
strcpy(bootscript + scriptlen, device); strcpy(bootscript + scriptlen, device);
scriptlen += strlen(device); scriptlen += strlen(device);
} else if (strcasecmp(tagbuf, "partition") == 0) { } else if (strncasecmp(tagbuf, "partition", 9) == 0) {
if (partition != -1) if (partition != -1)
sprintf(bootscript + scriptlen, "%d", partition); sprintf(bootscript + scriptlen, "%d", partition);
else else
*(bootscript + scriptlen) = 0; *(bootscript + scriptlen) = 0;
scriptlen = strlen(bootscript); scriptlen = strlen(bootscript);
} else if (strcasecmp(tagbuf, "directory") == 0) { } else if (strncasecmp(tagbuf, "directory", 9) == 0) {
strcpy(bootscript + scriptlen, directory); strcpy(bootscript + scriptlen, directory);
scriptlen += strlen(directory); scriptlen += strlen(directory);
} else if (strcasecmp(tagbuf, "filename") == 0) { } else if (strncasecmp(tagbuf, "filename", 8) == 0) {
strcpy(bootscript + scriptlen, filename); strcpy(bootscript + scriptlen, filename);
scriptlen += strlen(filename); scriptlen += strlen(filename);
} else if (strcasecmp(tagbuf, "full-path") == 0) { } else if (strncasecmp(tagbuf, "full-path", 9) == 0) {
strcpy(bootscript + scriptlen, bootpath); strcpy(bootscript + scriptlen, bootpath);
scriptlen += strlen(bootpath); scriptlen += strlen(bootpath);
} else { /* unknown, keep it */ } else { /* unknown, keep it */