diff options
author | tron <tron@pkgsrc.org> | 2002-09-15 19:25:38 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2002-09-15 19:25:38 +0000 |
commit | cf29830eecfa763c8c4ff2e87e11f067cba839c0 (patch) | |
tree | 8b5867a2015579732d0cee4cb07625d6cec46ac3 /sysutils | |
parent | 5de86789ec8a2a7d579886876a690b05096f9c40 (diff) | |
download | pkgsrc-cf29830eecfa763c8c4ff2e87e11f067cba839c0.tar.gz |
Fix a bug in this module which caused a kernel panic when the module was
loaded and unloaded without ever being used. The fix is based on an
analysis provided by MAEKAWA Masahide in private e-mail. Bump package
revision to reflect change.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/aperture/Makefile | 4 | ||||
-rw-r--r-- | sysutils/aperture/distinfo | 8 | ||||
-rw-r--r-- | sysutils/aperture/patches/patch-ab | 18 |
3 files changed, 21 insertions, 9 deletions
diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile index 979d0eb6097..869c3e1c49e 100644 --- a/sysutils/aperture/Makefile +++ b/sysutils/aperture/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2002/09/14 08:14:22 tron Exp $ +# $NetBSD: Makefile,v 1.22 2002/09/15 19:25:38 tron Exp $ DISTNAME= apNetBSD PKGNAME= aperture-2.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= sysutils x11 EXTRACT_SUFX= .shar diff --git a/sysutils/aperture/distinfo b/sysutils/aperture/distinfo index b58d96d9979..0d18484594c 100644 --- a/sysutils/aperture/distinfo +++ b/sysutils/aperture/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2002/09/14 08:14:22 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/09/15 19:25:38 tron Exp $ -SHA1 (aperture-2.0nb2/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b -Size (aperture-2.0nb2/apNetBSD.shar) = 66731 bytes +SHA1 (aperture-2.0nb3/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b +Size (aperture-2.0nb3/apNetBSD.shar) = 66731 bytes SHA1 (patch-aa) = 544d71b6524b7aaeb5deb985372599f1962af4fe -SHA1 (patch-ab) = 299cdbd9d2906a77fe4746996a7cf57b663dd07b +SHA1 (patch-ab) = 09cd6074c3846e3460679fcc42c61977a735b67f SHA1 (patch-ac) = 676b2f426d6f9e725262342e0d7e9ac1c8418362 SHA1 (patch-ad) = 22aa063237f08f38712017f310d535bc3e3ad0c8 SHA1 (patch-ae) = b6ae1d888db3a0cbefd7088a7acf7ca881fdc767 diff --git a/sysutils/aperture/patches/patch-ab b/sysutils/aperture/patches/patch-ab index 5c05857b541..d4a0db734a5 100644 --- a/sysutils/aperture/patches/patch-ab +++ b/sysutils/aperture/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.4 2002/09/14 08:14:22 tron Exp $ +$NetBSD: patch-ab,v 1.5 2002/09/15 19:25:38 tron Exp $ ---- module/xf86_mod.c.orig Mon Sep 9 12:29:28 2002 -+++ module/xf86_mod.c Mon Sep 9 12:30:05 2002 +--- module/xf86_mod.c.orig Sun Sep 15 21:18:40 2002 ++++ module/xf86_mod.c Sun Sep 15 21:22:02 2002 @@ -31,7 +31,11 @@ 0, seltrue, xf86mmap, 0}; @@ -14,3 +14,15 @@ $NetBSD: patch-ab,v 1.4 2002/09/14 08:14:22 tron Exp $ char *xf86_major_version = "2"; char *xf86_minor_version = "0"; +@@ -76,7 +80,10 @@ + + case LKM_E_UNLOAD: + /* Free allocated memory */ +- free(mem_range_softc.mr_desc, M_MEMDESC); ++ if (mem_range_softc.mr_desc != NULL) { ++ free(mem_range_softc.mr_desc, M_MEMDESC); ++ mem_range_softc.mr_desc = NULL; ++ } + break; + + case LKM_E_STAT: |