Page MenuHomeFreeBSD
Files F140057275

No OneTemporary
Actions

View Options

diff --git a/sbin/ipf/ipftest/ip_fil.c b/sbin/ipf/ipftest/ip_fil.c
index 6df3bed8224e..72816a73327e 100644
--- a/sbin/ipf/ipftest/ip_fil.c
+++ b/sbin/ipf/ipftest/ip_fil.c
@@ -622 +622 @@ int
-copyoutptr(softc, src, dst, size)
+ipf_copyout_indirect(softc, src, dst, size)
@@ -638 +638 @@ int
-copyinptr(src, dst, size)
+ipf_copyin_indirect(src, dst, size)
diff --git a/sbin/ipf/libipf/interror.c b/sbin/ipf/libipf/interror.c
index a7e6f4a5e431..98f550b5e3ff 100644
--- a/sbin/ipf/libipf/interror.c
+++ b/sbin/ipf/libipf/interror.c
@@ -31,2 +31,2 @@ static ipf_error_entry_t ipf_errors[] = {
- { 3, "copyinptr received bad address" },
- { 4, "copyoutptr received bad address" },
+ { 3, "ipf_copyin_indirect received bad address" },
+ { 4, "ipf_copyout_indirect received bad address" },
diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c
index 242affeff000..f8b8ffec7bdd 100644
--- a/sys/netpfil/ipfilter/netinet/fil.c
+++ b/sys/netpfil/ipfilter/netinet/fil.c
@@ -4054 +4054 @@ ipf_sync(ipf_main_softc_t *softc, void *ifp)
-/* Function: copyinptr */
+/* Function: ipf_copyin_indirect */
@@ -4065 +4065 @@ int
-copyinptr(ipf_main_softc_t *softc, void *src, void *dst, size_t size)
+ipf_copyin_indirect(ipf_main_softc_t *softc, void *src, void *dst, size_t size)
@@ -4087 +4087 @@ copyinptr(ipf_main_softc_t *softc, void *src, void *dst, size_t size)
-/* Function: copyoutptr */
+/* Function: ipf_copyout_indirect */
@@ -4098 +4098 @@ int
-copyoutptr(ipf_main_softc_t *softc, void *src, void *dst, size_t size)
+ipf_copyout_indirect(ipf_main_softc_t *softc, void *src, void *dst, size_t size)
diff --git a/sys/netpfil/ipfilter/netinet/ip_auth.c b/sys/netpfil/ipfilter/netinet/ip_auth.c
index 13ae4d8ae54a..1611e7596623 100644
--- a/sys/netpfil/ipfilter/netinet/ip_auth.c
+++ b/sys/netpfil/ipfilter/netinet/ip_auth.c
@@ -1018,2 +1018,3 @@ ipf_auth_wait(ipf_main_softc_t *softc, ipf_auth_softc_t *softa, char *data)
- error = copyoutptr(softc, MTOD(m, char *),
- &t, i);
+ error = ipf_copyout_indirect(softc,
+ MTOD(m, char *),
+ &t, i);
diff --git a/sys/netpfil/ipfilter/netinet/ip_fil.h b/sys/netpfil/ipfilter/netinet/ip_fil.h
index 24d4f9695322..81ad50373fe9 100644
--- a/sys/netpfil/ipfilter/netinet/ip_fil.h
+++ b/sys/netpfil/ipfilter/netinet/ip_fil.h
@@ -1682,2 +1682,3 @@ extern u_short ipf_cksum(u_short *, int);
-extern int copyinptr(ipf_main_softc_t *, void *, void *, size_t);
-extern int copyoutptr(ipf_main_softc_t *, void *, void *, size_t);
+extern int ipf_copyin_indirect(ipf_main_softc_t *, void *, void *, size_t);
+extern int ipf_copyout_indirect(ipf_main_softc_t *, void *, void *,
+ size_t);
diff --git a/sys/netpfil/ipfilter/netinet/ip_proxy.c b/sys/netpfil/ipfilter/netinet/ip_proxy.c
index 9fb6dbd2a9e1..c084b97c23d9 100644
--- a/sys/netpfil/ipfilter/netinet/ip_proxy.c
+++ b/sys/netpfil/ipfilter/netinet/ip_proxy.c
@@ -703,2 +703,2 @@ ipf_proxy_ioctl(ipf_main_softc_t *softc, caddr_t data, ioctlcmd_t cmd,
- error = copyinptr(softc, ctl.apc_data, ptr,
- ctl.apc_dsize);
+ error = ipf_copyin_indirect(softc, ctl.apc_data,
+ ptr, ctl.apc_dsize);
diff --git a/sys/netpfil/ipfilter/netinet/ip_scan.c b/sys/netpfil/ipfilter/netinet/ip_scan.c
index 744824bdb325..89d2fca855a3 100644
--- a/sys/netpfil/ipfilter/netinet/ip_scan.c
+++ b/sys/netpfil/ipfilter/netinet/ip_scan.c
@@ -109 +109 @@ ipf_scan_add(caddr_t data)
- err = copyinptr(data, isc, sizeof(*isc));
+ err = ipf_copyin_indirect(data, isc, sizeof(*isc));
@@ -153 +153 @@ ipf_scan_remove(caddr_t data)
- err = copyinptr(data, &isc, sizeof(isc));
+ err = ipf_copyin_indirect(data, &isc, sizeof(isc));

File Metadata

Mime Type
text/x-diff
Expires
Sun, Dec 21, 3:59 PM (1 d, 5 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27098608
Default Alt Text
(3 KB)

Event Timeline