david/ipxe
david/ipxe
Archived
1
0
Fork 0
Code

[script] Accept "#!gpxe" as well as "#!ipxe" as a script magic marker

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2010-05-22 00:27:10 +01:00
parent dc8eb04647
commit 13dfe2cf51
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/image/script.c
View File

@ -91,8 +91,12 @@ static int script_exec ( struct image *image ) {
* @ret rc Return status code
*/
static int script_load ( struct image *image ) {
static const char magic[] = "#!ipxe";
char test[ sizeof ( magic ) - 1 /* NUL */ + 1 /* terminating space */];
static const char ipxe_magic[] = "#!ipxe";
static const char gpxe_magic[] = "#!gpxe";
linker_assert ( sizeof ( ipxe_magic ) == sizeof ( gpxe_magic ),
magic_size_mismatch );
char test[ sizeof ( ipxe_magic ) - 1 /* NUL */
+ 1 /* terminating space */];
/* Sanity check */
if ( image->len < sizeof ( test ) ) {
@ -102,8 +106,9 @@ static int script_load ( struct image *image ) {
/* Check for magic signature */
copy_from_user ( test, image->data, 0, sizeof ( test ) );
if ( ( memcmp ( test, magic, ( sizeof ( test ) - 1 ) ) != 0 ) ||
! isspace ( test[ sizeof ( test ) - 1 ] ) ) {
if ( ! ( ( ( memcmp ( test, ipxe_magic, sizeof ( test ) - 1 ) == 0 ) ||
( memcmp ( test, gpxe_magic, sizeof ( test ) - 1 ) == 0 )) &&
isspace ( test[ sizeof ( test ) - 1 ] ) ) ) {
DBG ( "Invalid magic signature\n" );
return -ENOEXEC;
}