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

[pxe] Remove userptr_t from PXE file API implementation

Browse Source 
Simplify the PXE file API implementation by assuming that all string
buffers are directly accessible via pointer dereferences.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2025-04-25 00:41:20 +01:00
parent 8b3b4f2454
commit 338cebfeef
1 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/arch/x86/interface/pxe/pxe_file.c
View File

@@ -53,30 +53,20 @@ FEATURE ( FEATURE_MISC, "PXEXT", DHCP_EB_FEATURE_PXE_EXT, 2 );
* *
*/ */
static PXENV_EXIT_t pxenv_file_open ( struct s_PXENV_FILE_OPEN *file_open ) { static PXENV_EXIT_t pxenv_file_open ( struct s_PXENV_FILE_OPEN *file_open ) {
userptr_t filename; const char *filename;
size_t filename_len;
int fd; int fd;
DBG ( "PXENV_FILE_OPEN" ); DBG ( "PXENV_FILE_OPEN" );
/* Copy name from external program, and open it */ /* Open specified filename */
filename = real_to_virt ( file_open->FileName.segment, filename = real_to_virt ( file_open->FileName.segment,
file_open->FileName.offset ); file_open->FileName.offset );
filename_len = strlen ( filename ); DBG ( " %s", filename );
{ fd = open ( filename );
char uri_string[ filename_len + 1 ];
copy_from_user ( uri_string, filename, 0,
sizeof ( uri_string ) );
DBG ( " %s", uri_string );
fd = open ( uri_string );
}
if ( fd < 0 ) { if ( fd < 0 ) {
file_open->Status = PXENV_STATUS ( fd ); file_open->Status = PXENV_STATUS ( fd );
return PXENV_EXIT_FAILURE; return PXENV_EXIT_FAILURE;
} }
DBG ( " as file %d", fd ); DBG ( " as file %d", fd );
file_open->FileHandle = fd; file_open->FileHandle = fd;
@@ -210,28 +200,19 @@ pxenv_get_file_size ( struct s_PXENV_GET_FILE_SIZE *get_file_size ) {
* *
*/ */
static PXENV_EXIT_t pxenv_file_exec ( struct s_PXENV_FILE_EXEC *file_exec ) { static PXENV_EXIT_t pxenv_file_exec ( struct s_PXENV_FILE_EXEC *file_exec ) {
userptr_t command; const char *command;
size_t command_len;
int rc; int rc;
DBG ( "PXENV_FILE_EXEC" ); DBG ( "PXENV_FILE_EXEC" );
/* Copy name from external program, and exec it */ /* Execute specified command */
command = real_to_virt ( file_exec->Command.segment, command = real_to_virt ( file_exec->Command.segment,
file_exec->Command.offset ); file_exec->Command.offset );
command_len = strlen ( command ); DBG ( " %s", command );
{ if ( ( rc = system ( command ) ) != 0 ) {
char command_string[ command_len + 1 ];
copy_from_user ( command_string, command, 0,
sizeof ( command_string ) );
DBG ( " %s", command_string );
if ( ( rc = system ( command_string ) ) != 0 ) {
file_exec->Status = PXENV_STATUS ( rc ); file_exec->Status = PXENV_STATUS ( rc );
return PXENV_EXIT_FAILURE; return PXENV_EXIT_FAILURE;
} }
}
file_exec->Status = PXENV_STATUS_SUCCESS; file_exec->Status = PXENV_STATUS_SUCCESS;
return PXENV_EXIT_SUCCESS; return PXENV_EXIT_SUCCESS;
@@ -251,8 +232,7 @@ static PXENV_EXIT_t pxenv_file_exec ( struct s_PXENV_FILE_EXEC *file_exec ) {
*/ */
static PXENV_EXIT_t static PXENV_EXIT_t
pxenv_file_cmdline ( struct s_PXENV_FILE_CMDLINE *file_cmdline ) { pxenv_file_cmdline ( struct s_PXENV_FILE_CMDLINE *file_cmdline ) {
userptr_t buffer; char *buffer;
size_t max_len;
size_t len; size_t len;
DBG ( "PXENV_FILE_CMDLINE to %04x:%04x+%04x \"%s\"\n", DBG ( "PXENV_FILE_CMDLINE to %04x:%04x+%04x \"%s\"\n",
@@ -262,12 +242,12 @@ pxenv_file_cmdline ( struct s_PXENV_FILE_CMDLINE *file_cmdline ) {
buffer = real_to_virt ( file_cmdline->Buffer.segment, buffer = real_to_virt ( file_cmdline->Buffer.segment,
file_cmdline->Buffer.offset ); file_cmdline->Buffer.offset );
len = file_cmdline->BufferSize; len = file_cmdline->BufferSize;
max_len = ( pxe_cmdline ? if ( pxe_cmdline ) {
( strlen ( pxe_cmdline ) + 1 /* NUL */ ) : 0 ); len = snprintf ( buffer, len, "%s", pxe_cmdline );
if ( len > max_len ) file_cmdline->BufferSize = ( len + 1 /* NUL */ );
len = max_len; } else {
copy_to_user ( buffer, 0, pxe_cmdline, len ); file_cmdline->BufferSize = 0;
file_cmdline->BufferSize = max_len; }
file_cmdline->Status = PXENV_STATUS_SUCCESS; file_cmdline->Status = PXENV_STATUS_SUCCESS;
return PXENV_EXIT_SUCCESS; return PXENV_EXIT_SUCCESS;