sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-15 09:04:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

[script] Remove userptr_t from script image parsing

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2025-04-24 16:12:43 +01:00
parent 8923a216b0
commit 4f4f6c33ec
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/image/script.c
View File

@@ -69,7 +69,7 @@ static int process_script ( struct image *image,
size_t line_offset; size_t line_offset;
char *label; char *label;
char *command; char *command;
off_t eol; const void *eol;
size_t frag_len; size_t frag_len;
char *tmp; char *tmp;
int rc; int rc;
@@ -81,11 +81,13 @@ static int process_script ( struct image *image,
do { do {
/* Find length of next line, excluding any terminating '\n' */ /* Find length of next line, excluding any terminating '\n' */
eol = memchr_user ( image->data, script_offset, '\n', eol = memchr ( ( image->data + script_offset ), '\n',
( image->len - script_offset ) ); ( image->len - script_offset ) );
if ( eol < 0 ) if ( eol ) {
eol = image->len; frag_len = ( ( eol - image->data ) - script_offset );
frag_len = ( eol - script_offset ); } else {
frag_len = ( image->len - script_offset );
}
/* Allocate buffer for line */ /* Allocate buffer for line */
tmp = realloc ( line, ( len + frag_len + 1 /* NUL */ ) ); tmp = realloc ( line, ( len + frag_len + 1 /* NUL */ ) );
@@ -96,8 +98,8 @@ static int process_script ( struct image *image,
line = tmp; line = tmp;
/* Copy line */ /* Copy line */
copy_from_user ( ( line + len ), image->data, script_offset, memcpy ( ( line + len ), ( image->data + script_offset ),
frag_len ); frag_len );
len += frag_len; len += frag_len;
/* Move to next line in script */ /* Move to next line in script */
@@ -220,20 +222,24 @@ static int script_probe ( struct image *image ) {
static const char ipxe_magic[] = "#!ipxe"; static const char ipxe_magic[] = "#!ipxe";
static const char gpxe_magic[] = "#!gpxe"; static const char gpxe_magic[] = "#!gpxe";
static_assert ( sizeof ( ipxe_magic ) == sizeof ( gpxe_magic ) ); static_assert ( sizeof ( ipxe_magic ) == sizeof ( gpxe_magic ) );
char test[ sizeof ( ipxe_magic ) - 1 /* NUL */ const struct {
+ 1 /* terminating space */]; char magic[ sizeof ( ipxe_magic ) - 1 /* NUL */ ];
char space;
} __attribute__ (( packed )) *test;
/* Sanity check */ /* Sanity check */
if ( image->len < sizeof ( test ) ) { if ( image->len < sizeof ( *test ) ) {
DBGC ( image, "Too short to be a script\n" ); DBGC ( image, "Too short to be a script\n" );
return -ENOEXEC; return -ENOEXEC;
} }
/* Check for magic signature */ /* Check for magic signature */
copy_from_user ( test, image->data, 0, sizeof ( test ) ); test = image->data;
if ( ! ( ( ( memcmp ( test, ipxe_magic, sizeof ( test ) - 1 ) == 0 ) || if ( ! ( ( ( memcmp ( test->magic, ipxe_magic,
( memcmp ( test, gpxe_magic, sizeof ( test ) - 1 ) == 0 )) && sizeof ( test->magic ) ) == 0 ) ||
isspace ( test[ sizeof ( test ) - 1 ] ) ) ) { ( memcmp ( test->magic, gpxe_magic,
sizeof ( test->magic ) ) == 0 ) ) &&
isspace ( test->space ) ) ) {
DBGC ( image, "Invalid magic signature\n" ); DBGC ( image, "Invalid magic signature\n" );
return -ENOEXEC; return -ENOEXEC;
} }