sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-14 16:01:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

[prefix] Remove userptr_t from command line image construction

Browse Source 
Simplify cmdline_init() by assuming that the externally provided
command line is directly accessible via pointer dereferences.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2025-04-28 23:54:01 +01:00
parent c9fb94dbaa
commit 43fc516298
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/arch/x86/core/runtime.c
View File

@@ -114,9 +114,7 @@ static void cmdline_strip ( char *cmdline, const char *cruft ) {
* @ret rc Return status code * @ret rc Return status code
*/ */
static int cmdline_init ( void ) { static int cmdline_init ( void ) {
userptr_t cmdline_user;
char *cmdline; char *cmdline;
size_t len;
int rc; int rc;
/* Do nothing if no command line was specified */ /* Do nothing if no command line was specified */
@@ -124,19 +122,15 @@ static int cmdline_init ( void ) {
DBGC ( colour, "RUNTIME found no command line\n" ); DBGC ( colour, "RUNTIME found no command line\n" );
return 0; return 0;
} }
cmdline_user = phys_to_virt ( cmdline_phys );
len = ( strlen ( cmdline_user ) + 1 /* NUL */ );
/* Allocate and copy command line */ /* Allocate and copy command line */
cmdline_copy = malloc ( len ); cmdline_copy = strdup ( phys_to_virt ( cmdline_phys ) );
if ( ! cmdline_copy ) { if ( ! cmdline_copy ) {
DBGC ( colour, "RUNTIME could not allocate %zd bytes for " DBGC ( colour, "RUNTIME could not allocate command line\n" );
"command line\n", len );
rc = -ENOMEM; rc = -ENOMEM;
goto err_alloc_cmdline_copy; goto err_alloc_cmdline_copy;
} }
cmdline = cmdline_copy; cmdline = cmdline_copy;
copy_from_user ( cmdline, cmdline_user, 0, len );
DBGC ( colour, "RUNTIME found command line \"%s\" at %08x\n", DBGC ( colour, "RUNTIME found command line \"%s\" at %08x\n",
cmdline, cmdline_phys ); cmdline, cmdline_phys );
@@ -151,7 +145,7 @@ static int cmdline_init ( void ) {
DBGC ( colour, "RUNTIME using command line \"%s\"\n", cmdline ); DBGC ( colour, "RUNTIME using command line \"%s\"\n", cmdline );
/* Prepare and register image */ /* Prepare and register image */
cmdline_image.data = virt_to_user ( cmdline ); cmdline_image.data = cmdline;
cmdline_image.len = strlen ( cmdline ); cmdline_image.len = strlen ( cmdline );
if ( cmdline_image.len ) { if ( cmdline_image.len ) {
if ( ( rc = register_image ( &cmdline_image ) ) != 0 ) { if ( ( rc = register_image ( &cmdline_image ) ) != 0 ) {