[Glibc-bsd-commits] r2380 - in trunk/kfreebsd-7/debian: . patches
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Mon Mar 23 21:42:33 UTC 2009
Author: aurel32
Date: 2009-03-23 21:42:33 +0000 (Mon, 23 Mar 2009)
New Revision: 2380
Added:
trunk/kfreebsd-7/debian/patches/000_kenv.diff
trunk/kfreebsd-7/debian/patches/000_ktimer.diff
Modified:
trunk/kfreebsd-7/debian/changelog
trunk/kfreebsd-7/debian/compat
trunk/kfreebsd-7/debian/control.in
trunk/kfreebsd-7/debian/patches/series
trunk/kfreebsd-7/debian/rules
Log:
* debian/control.in: bump Standards-Version to 3.8.1 (no changes).
* debian/control.in, debian/compat: switch to debhelper 5.
* debian/rules: make sure ~/.quiltrc or /etc/quilt.quiltrc is not used.
* 000_ktimer.diff: fix local privilege escalation (CVE-2009-1041 /
FreeBSD-SA-09:06.ktimer).
* 000_kenv.diff: fix kernel panic when dumping environment
(FreeBSD-EN-09:01.kenv).
Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog 2009-03-22 17:32:37 UTC (rev 2379)
+++ trunk/kfreebsd-7/debian/changelog 2009-03-23 21:42:33 UTC (rev 2380)
@@ -1,8 +1,15 @@
kfreebsd-7 (7.1-3) unstable; urgency=low
* debian/control.{flavor.,}in: change the section to kernel.
+ * debian/control.in: bump Standards-Version to 3.8.1 (no changes).
+ * debian/control.in, debian/compat: switch to debhelper 5.
+ * debian/rules: make sure ~/.quiltrc or /etc/quilt.quiltrc is not used.
+ * 000_ktimer.diff: fix local privilege escalation (CVE-2009-1041 /
+ FreeBSD-SA-09:06.ktimer).
+ * 000_kenv.diff: fix kernel panic when dumping environment
+ (FreeBSD-EN-09:01.kenv).
- -- Aurelien Jarno <aurel32 at debian.org> Sun, 15 Mar 2009 19:39:58 +0100
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 23 Mar 2009 19:00:14 +0100
kfreebsd-7 (7.1-2) unstable; urgency=low
Modified: trunk/kfreebsd-7/debian/compat
===================================================================
--- trunk/kfreebsd-7/debian/compat 2009-03-22 17:32:37 UTC (rev 2379)
+++ trunk/kfreebsd-7/debian/compat 2009-03-23 21:42:33 UTC (rev 2380)
@@ -1 +1 @@
-4
+5
Modified: trunk/kfreebsd-7/debian/control.in
===================================================================
--- trunk/kfreebsd-7/debian/control.in 2009-03-22 17:32:37 UTC (rev 2379)
+++ trunk/kfreebsd-7/debian/control.in 2009-03-23 21:42:33 UTC (rev 2380)
@@ -5,8 +5,8 @@
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
-Build-Depends: debhelper (>= 4.1.0), bzip2, quilt, freebsd-buildutils (>= @major@) [kfreebsd-i386 kfreebsd-amd64] | freebsd6-buildutils (>= 6.2) [kfreebsd-i386 kfreebsd-amd64], libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5.0.0), bzip2, quilt, freebsd-buildutils (>= @major@) [kfreebsd-i386 kfreebsd-amd64] | freebsd6-buildutils (>= 6.2) [kfreebsd-i386 kfreebsd-amd64], libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
+Standards-Version: 3.8.1
Package: kfreebsd-source- at version@
Architecture: all
Added: trunk/kfreebsd-7/debian/patches/000_kenv.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/000_kenv.diff (rev 0)
+++ trunk/kfreebsd-7/debian/patches/000_kenv.diff 2009-03-23 21:42:33 UTC (rev 2380)
@@ -0,0 +1,33 @@
+Index: head/sys/kern/kern_environment.c
+===================================================================
+--- head/sys/kern/kern_environment.c (revision 190221)
++++ head/sys/kern/kern_environment.c (working copy)
+@@ -87,7 +87,7 @@
+ } */ *uap;
+ {
+ char *name, *value, *buffer = NULL;
+- size_t len, done, needed;
++ size_t len, done, needed, buflen;
+ int error, i;
+
+ KASSERT(dynamic_kenv, ("kenv: dynamic_kenv = 0"));
+@@ -100,13 +100,17 @@
+ return (error);
+ #endif
+ done = needed = 0;
++ buflen = uap->len;
++ if (buflen > KENV_SIZE * (KENV_MNAMELEN + KENV_MVALLEN + 2))
++ buflen = KENV_SIZE * (KENV_MNAMELEN +
++ KENV_MVALLEN + 2);
+ if (uap->len > 0 && uap->value != NULL)
+- buffer = malloc(uap->len, M_TEMP, M_WAITOK|M_ZERO);
++ buffer = malloc(buflen, M_TEMP, M_WAITOK|M_ZERO);
+ mtx_lock(&kenv_lock);
+ for (i = 0; kenvp[i] != NULL; i++) {
+ len = strlen(kenvp[i]) + 1;
+ needed += len;
+- len = min(len, uap->len - done);
++ len = min(len, buflen - done);
+ /*
+ * If called with a NULL or insufficiently large
+ * buffer, just keep computing the required size.
Added: trunk/kfreebsd-7/debian/patches/000_ktimer.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/000_ktimer.diff (rev 0)
+++ trunk/kfreebsd-7/debian/patches/000_ktimer.diff 2009-03-23 21:42:33 UTC (rev 2380)
@@ -0,0 +1,14 @@
+Index: head/sys/kern/kern_time.c
+===================================================================
+--- head/sys/kern/kern_time.c (revision 190192)
++++ head/sys/kern/kern_time.c (working copy)
+@@ -1085,7 +1085,8 @@
+ struct itimer *it;
+
+ PROC_LOCK_ASSERT(p, MA_OWNED);
+- if ((p->p_itimers == NULL) || (timerid >= TIMER_MAX) ||
++ if ((p->p_itimers == NULL) ||
++ (timerid < 0) || (timerid >= TIMER_MAX) ||
+ (it = p->p_itimers->its_timers[timerid]) == NULL) {
+ return (NULL);
+ }
Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series 2009-03-22 17:32:37 UTC (rev 2379)
+++ trunk/kfreebsd-7/debian/patches/series 2009-03-23 21:42:33 UTC (rev 2380)
@@ -1,4 +1,6 @@
000_ext2fs.diff
+000_kenv.diff
+000_ktimer.diff
001_misc.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules 2009-03-22 17:32:37 UTC (rev 2379)
+++ trunk/kfreebsd-7/debian/rules 2009-03-23 21:42:33 UTC (rev 2380)
@@ -80,7 +80,7 @@
-e 's,#\( \|\t\)*include\( \|\t\)*\(<\|"\)pflog.h\(>\|"\),,g' \
; done)
- set -e ; cd $(CURDIR)/src ; QUILT_PC=$(CURDIR)/.pc QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a ; cd $(CURDIR)
+ set -e ; cd $(CURDIR)/src ; QUILT_PC=$(CURDIR)/.pc QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a ; cd $(CURDIR)
install debian/gen-ld-u-options src/usr.sbin/config
grep -v ^__FBSDID src/sys/kern/subr_sbuf.c > src/usr.sbin/config/sbuf.c
More information about the Glibc-bsd-commits
mailing list