sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-02-03 14:39:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

[umalloc] Remove userptr_t from user memory allocations

Browse Source 
Use standard void pointers for umalloc(), urealloc(), and ufree(),
with the "u" prefix retained to indicate that these allocations are
made from external ("user") memory rather than from the internal heap.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2025-04-23 12:47:53 +01:00
parent 0bf0f8716a
commit 839540cb95
13 changed files with 101 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/xferbuf.c
View File

@@ -237,8 +237,8 @@ struct xfer_buffer_operations xferbuf_malloc_operations = {
* @ret rc Return status code
*/
static int xferbuf_umalloc_realloc ( struct xfer_buffer *xferbuf, size_t len ) {
userptr_t *udata = xferbuf->data;
userptr_t new_udata;
void **udata = xferbuf->data;
void *new_udata;
new_udata = urealloc ( *udata, len );
if ( ! new_udata )
@@ -257,9 +257,9 @@ static int xferbuf_umalloc_realloc ( struct xfer_buffer *xferbuf, size_t len ) {
*/
static void xferbuf_umalloc_write ( struct xfer_buffer *xferbuf, size_t offset,
const void *data, size_t len ) {
userptr_t *udata = xferbuf->data;
void **udata = xferbuf->data;
copy_to_user ( *udata, offset, data, len );
memcpy ( ( *udata + offset ), data, len );
}
/**
@@ -272,9 +272,9 @@ static void xferbuf_umalloc_write ( struct xfer_buffer *xferbuf, size_t offset,
*/
static void xferbuf_umalloc_read ( struct xfer_buffer *xferbuf, size_t offset,
void *data, size_t len ) {
userptr_t *udata = xferbuf->data;
void **udata = xferbuf->data;
copy_from_user ( data, *udata, offset, len );
memcpy ( data, ( *udata + offset ), len );
}
/** umalloc()-based data buffer operations */