diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-11-01 23:42:38 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-11-01 23:42:38 +0000 |
| commit | bcedfd1823f5e4d0b32f047cfad4787be584d585 (patch) | |
| tree | 2241b7fec908c44da1af633d2a9931ac6a871f49 | |
| parent | Update to 2.0.0. (diff) | |
Fix a problem dereferencing kernel memory when hunting for a files
inode in -CURRENT. Thanks to jhb for helping with the the solution.
Reviewed by: jhb
| -rw-r--r-- | devel/libgtop2/Makefile | 2 | ||||
| -rw-r--r-- | devel/libgtop2/files/patch-ah | 36 |
2 files changed, 23 insertions, 15 deletions
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index f3fdabea4c59..fe0491026828 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgtop2 PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah index 38a4d68296bd..21214bedb760 100644 --- a/devel/libgtop2/files/patch-ah +++ b/devel/libgtop2/files/patch-ah @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- sysdeps/freebsd/procmap.c.orig Tue Jun 11 00:34:42 2002 -+++ sysdeps/freebsd/procmap.c Tue Oct 8 16:36:02 2002 +--- procmap.c.orig Mon Jun 10 17:34:42 2002 ++++ procmap.c Sat Oct 26 01:20:26 2002 @@ -33,7 +33,11 @@ #include <sys/proc.h> #include <sys/resource.h> @@ -15,15 +12,18 @@ $FreeBSD$ #include <vm/vm_map.h> #include <sys/vnode.h> -@@ -92,7 +96,6 @@ +@@ -91,8 +95,9 @@ + glibtop_map_entry *maps; #if defined __FreeBSD__ struct vnode vnode; ++#if __FreeBSD_version < 500039 struct inode inode; - struct mount mount; ++#endif #endif int count, i = 0; int update = 0; -@@ -114,7 +117,11 @@ +@@ -114,7 +119,11 @@ /* Now we get the memory maps. */ if (kvm_read (server->machine.kd, @@ -35,26 +35,34 @@ $FreeBSD$ (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace)) glibtop_error_io_r (server, "kvm_read (vmspace)"); -@@ -244,18 +251,17 @@ +@@ -244,6 +253,15 @@ &vnode, sizeof (vnode)) != sizeof (vnode)) glibtop_error_io_r (server, "kvm_read (vnode)"); +#if __FreeBSD_version >= 500039 -+ if ((vnode.v_type != VREG) || strcmp("ufs", vnode.v_tag) || ++ switch (vnode.v_type) { ++ case VREG: ++ maps [i-1].inode = vnode.v_cachedid; ++ maps [i-1].device = vnode.v_cachedfs; ++ default: ++ continue; ++ } +#else if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || -+#endif !vnode.v_data) continue; - if (kvm_read (server->machine.kd, - (unsigned long) vnode.v_data, +@@ -252,13 +270,9 @@ &inode, sizeof (inode)) != sizeof (inode)) glibtop_error_io_r (server, "kvm_read (inode)"); -- + - if (kvm_read (server->machine.kd, - (unsigned long) vnode.v_mount, - &mount, sizeof (mount)) != sizeof (mount)) - glibtop_error_io_r (server, "kvm_read (mount)"); - +- maps [i-1].inode = inode.i_number; maps [i-1].device = inode.i_dev; ++#endif + #endif + } while (entry.next != first); + |