From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 30 Apr 2025 13:33:57 +0000 (+0100)
Subject: [uaccess] Reduce scope of included uaccess.h header
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a169d73593f6c471857a694edc22809608c7d9c0;p=thirdparty%2Fipxe.git

[uaccess] Reduce scope of included uaccess.h header

The uaccess.h header is no longer required for any code that touches
external ("user") memory, since such memory accesses are now performed
through pointer dereferences.  Reduce the number of files including
this header.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/arch/x86/image/elfboot.c b/src/arch/x86/image/elfboot.c
index f662e366f..7f89e8b65 100644
--- a/src/arch/x86/image/elfboot.c
+++ b/src/arch/x86/image/elfboot.c
@@ -30,6 +30,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/elf.h>
 #include <ipxe/features.h>
 #include <ipxe/init.h>
+#include <ipxe/uaccess.h>
 
 /**
  * @file
diff --git a/src/arch/x86/image/pxe_image.c b/src/arch/x86/image/pxe_image.c
index 3e6cf7268..ccb3a7d9d 100644
--- a/src/arch/x86/image/pxe_image.c
+++ b/src/arch/x86/image/pxe_image.c
@@ -34,7 +34,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <pxe.h>
 #include <pxe_call.h>
 #include <pic8259.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/image.h>
 #include <ipxe/segment.h>
 #include <ipxe/netdevice.h>
diff --git a/src/arch/x86/interface/pxe/pxe_file.c b/src/arch/x86/interface/pxe/pxe_file.c
index b934e8fef..997667ccf 100644
--- a/src/arch/x86/interface/pxe/pxe_file.c
+++ b/src/arch/x86/interface/pxe/pxe_file.c
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/posix_io.h>
 #include <ipxe/features.h>
 #include <pxe.h>
diff --git a/src/core/cachedhcp.c b/src/core/cachedhcp.c
index 1510f3321..eeb2fca58 100644
--- a/src/core/cachedhcp.c
+++ b/src/core/cachedhcp.c
@@ -31,6 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/init.h>
 #include <ipxe/netdevice.h>
 #include <ipxe/vlan.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/cachedhcp.h>
 
 /** @file
diff --git a/src/core/downloader.c b/src/core/downloader.c
index 9950fe5e4..1c638f502 100644
--- a/src/core/downloader.c
+++ b/src/core/downloader.c
@@ -31,7 +31,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/xfer.h>
 #include <ipxe/open.h>
 #include <ipxe/job.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/umalloc.h>
 #include <ipxe/image.h>
 #include <ipxe/xferbuf.h>
diff --git a/src/core/fbcon.c b/src/core/fbcon.c
index 43f73fbac..ef158aec7 100644
--- a/src/core/fbcon.c
+++ b/src/core/fbcon.c
@@ -36,6 +36,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/ansiesc.h>
 #include <ipxe/image.h>
 #include <ipxe/pixbuf.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/umalloc.h>
 #include <ipxe/console.h>
 #include <ipxe/fbcon.h>
diff --git a/src/core/image.c b/src/core/image.c
index a06466b72..b2bd0956b 100644
--- a/src/core/image.c
+++ b/src/core/image.c
@@ -33,6 +33,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <libgen.h>
 #include <syslog.h>
 #include <ipxe/list.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/umalloc.h>
 #include <ipxe/uri.h>
 #include <ipxe/image.h>
diff --git a/src/drivers/bus/ecam.c b/src/drivers/bus/ecam.c
index 35556a8d9..976254c18 100644
--- a/src/drivers/bus/ecam.c
+++ b/src/drivers/bus/ecam.c
@@ -25,7 +25,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <string.h>
 #include <errno.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/ecam.h>
 
 /** @file
diff --git a/src/hci/commands/image_mem_cmd.c b/src/hci/commands/image_mem_cmd.c
index 5f8363461..fcd766627 100644
--- a/src/hci/commands/image_mem_cmd.c
+++ b/src/hci/commands/image_mem_cmd.c
@@ -24,6 +24,7 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <getopt.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/command.h>
 #include <ipxe/parseopt.h>
 #include <usr/imgmgmt.h>
diff --git a/src/image/elf.c b/src/image/elf.c
index 97e07f37f..8cbb610a6 100644
--- a/src/image/elf.c
+++ b/src/image/elf.c
@@ -38,6 +38,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <elf.h>
 #include <ipxe/segment.h>
 #include <ipxe/image.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/elf.h>
 
 /**
diff --git a/src/include/ipxe/dhcp.h b/src/include/ipxe/dhcp.h
index 51349efd9..4d68d3ca5 100644
--- a/src/include/ipxe/dhcp.h
+++ b/src/include/ipxe/dhcp.h
@@ -17,7 +17,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/tables.h>
 #include <ipxe/uuid.h>
 #include <ipxe/netdevice.h>
-#include <ipxe/uaccess.h>
 
 struct interface;
 struct dhcp_options;
diff --git a/src/include/ipxe/image.h b/src/include/ipxe/image.h
index fbf2b63b9..e0e70f360 100644
--- a/src/include/ipxe/image.h
+++ b/src/include/ipxe/image.h
@@ -12,7 +12,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/tables.h>
 #include <ipxe/list.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/refcnt.h>
 
 struct uri;
diff --git a/src/include/ipxe/iomap.h b/src/include/ipxe/iomap.h
index b8ded38ef..7d1547d9c 100644
--- a/src/include/ipxe/iomap.h
+++ b/src/include/ipxe/iomap.h
@@ -14,7 +14,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <stdint.h>
 #include <ipxe/api.h>
 #include <config/ioapi.h>
-#include <ipxe/uaccess.h>
 
 /**
  * Calculate static inline I/O mapping API function name
diff --git a/src/include/ipxe/iomap_virt.h b/src/include/ipxe/iomap_virt.h
index 731d083d5..3dd66bd75 100644
--- a/src/include/ipxe/iomap_virt.h
+++ b/src/include/ipxe/iomap_virt.h
@@ -10,6 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stddef.h>
+#include <ipxe/uaccess.h>
 
 #ifdef IOMAP_VIRT
 #define IOMAP_PREFIX_virt
diff --git a/src/include/ipxe/xen.h b/src/include/ipxe/xen.h
index 0fb8b7625..382901ff3 100644
--- a/src/include/ipxe/xen.h
+++ b/src/include/ipxe/xen.h
@@ -14,7 +14,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/bitops.h>
-#include <ipxe/uaccess.h>
 #include <xen/xen.h>
 #include <xen/event_channel.h>
 
diff --git a/src/interface/efi/efi_cmdline.c b/src/interface/efi/efi_cmdline.c
index d5ec6cee3..8b9d8efde 100644
--- a/src/interface/efi/efi_cmdline.c
+++ b/src/interface/efi/efi_cmdline.c
@@ -37,6 +37,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/init.h>
 #include <ipxe/image.h>
 #include <ipxe/script.h>
+#include <ipxe/uaccess.h>
 #include <ipxe/efi/efi.h>
 #include <ipxe/efi/efi_cmdline.h>
 
diff --git a/src/net/pccrc.c b/src/net/pccrc.c
index 29adc4b16..0db6e3cb5 100644
--- a/src/net/pccrc.c
+++ b/src/net/pccrc.c
@@ -25,7 +25,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <errno.h>
 #include <assert.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/sha256.h>
 #include <ipxe/sha512.h>
 #include <ipxe/hmac.h>
diff --git a/src/usr/imgtrust.c b/src/usr/imgtrust.c
index 4eb631e79..e60854c9f 100644
--- a/src/usr/imgtrust.c
+++ b/src/usr/imgtrust.c
@@ -28,7 +28,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <errno.h>
 #include <time.h>
 #include <syslog.h>
-#include <ipxe/uaccess.h>
 #include <ipxe/image.h>
 #include <ipxe/cms.h>
 #include <ipxe/validator.h>