[Glibc-bsd-commits] r2316 - in trunk/kfreebsd-7/debian: . patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Fri Sep 12 08:26:03 UTC 2008
Author: ps-guest
Date: 2008-09-12 08:26:02 +0000 (Fri, 12 Sep 2008)
New Revision: 2316
Removed:
trunk/kfreebsd-7/debian/patches/000_tcp.diff
trunk/kfreebsd-7/debian/patches/030_abi_cld.diff
Modified:
trunk/kfreebsd-7/debian/changelog
Log:
* merge unstable changelog
Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog 2008-09-05 08:59:21 UTC (rev 2315)
+++ trunk/kfreebsd-7/debian/changelog 2008-09-12 08:26:02 UTC (rev 2316)
@@ -1,24 +1,10 @@
-kfreebsd-7 (7.1~cvs20080904-1) experimental; urgency=low
+kfreebsd-7 (7.1~cvs20080912-1) EXPERIMENTAL; urgency=low
[ Petr Salinger ]
* New upstream snapshot of RELENG_7
- update of some patches
- - Fix amd64 swapgs local privilege escalation
- (FreeBSD-SA-08:07.amd64 / CVE-2008-3890).
- - Fix nmount(2) local arbitrary code execution
- (FreeBSD-SA-08:08.nmount / CVE-2008-3531).
- - Fix remote kernel panics on IPv6 connections
- (FreeBSD-SA-08:09.icmp6 /CVE-2008-3530).
-
- -- Aurelien Jarno <aurel32 at debian.org> Mon, 01 Sep 2008 11:34:46 +0200
-
-kfreebsd-7 (7.1~cvs20080806-1) experimental; urgency=low
-
- [ Petr Salinger ]
- * New upstream snapshot of RELENG_7
- - update of some patches
- refresh remaining patches
- - 030_abi_cld.diff and 000_tcp.diff applied upstream
+ - 030_abi_cld.diff and 000_*.diff applied upstream
* Reduce number of kernel-image flavours
* Reenable ums driver in GENERIC. Closes: #492891.
* Do not specify SMP in GENERIC, it is enabled on per flavour basis
@@ -34,8 +20,19 @@
* debian/patches/*: convert to patchlevel p1 as requested by the new
dpkg-source.
- -- Aurelien Jarno <aurel32 at debian.org> Wed, 06 Aug 2008 20:34:46 +0200
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 12 Sep 2008 10:34:46 +0200
+kfreebsd-7 (7.0-5) unstable; urgency=high
+
+ * Fix amd64 swapgs local privilege escalation
+ (FreeBSD-SA-08:07.amd64 / CVE-2008-3890).
+ * Fix nmount(2) local arbitrary code execution
+ (FreeBSD-SA-08:08.nmount / CVE-2008-3531).
+ * Fix remote kernel panics on IPv6 connections
+ (FreeBSD-SA-08:09.icmp6 /CVE-2008-3530).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Thu, 04 Sep 2008 11:49:44 +0200
+
kfreebsd-7 (7.0-4) unstable; urgency=medium
[ Petr Salinger ]
Deleted: trunk/kfreebsd-7/debian/patches/000_tcp.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/000_tcp.diff 2008-09-05 08:59:21 UTC (rev 2315)
+++ trunk/kfreebsd-7/debian/patches/000_tcp.diff 2008-09-12 08:26:02 UTC (rev 2316)
@@ -1,94 +0,0 @@
-Index: src/sys/netinet/tcp.h
-===================================================================
-RCS file: /home/ncvs/src/sys/netinet/tcp.h,v
-retrieving revision 1.40
-diff -p -u -I__FBSDID -I$FreeBSD -r1.40 tcp.h
---- src/sys/netinet/tcp.h 25 May 2007 21:28:49 -0000 1.40
-+++ src/sys/netinet/tcp.h 18 Jun 2008 05:36:20 -0000
-@@ -78,6 +78,8 @@ struct tcphdr {
-
- #define TCPOPT_EOL 0
- #define TCPOLEN_EOL 1
-+#define TCPOPT_PAD 0 /* padding after EOL */
-+#define TCPOLEN_PAD 1
- #define TCPOPT_NOP 1
- #define TCPOLEN_NOP 1
- #define TCPOPT_MAXSEG 2
-Index: src/sys/netinet/tcp_output.c
-===================================================================
-RCS file: /home/ncvs/src/sys/netinet/tcp_output.c,v
-retrieving revision 1.141.2.3
-diff -p -u -I__FBSDID -I$FreeBSD -r1.141.2.3 tcp_output.c
---- src/sys/netinet/tcp_output.c 5 Dec 2007 10:37:17 -0000 1.141.2.3
-+++ src/sys/netinet/tcp_output.c 18 Jun 2008 05:36:21 -0000
-@@ -1280,12 +1280,16 @@ tcp_addoptions(struct tcpopt *to, u_char
- for (mask = 1; mask < TOF_MAXOPT; mask <<= 1) {
- if ((to->to_flags & mask) != mask)
- continue;
-+ if (optlen == TCP_MAXOLEN)
-+ break;
- switch (to->to_flags & mask) {
- case TOF_MSS:
- while (optlen % 4) {
- optlen += TCPOLEN_NOP;
- *optp++ = TCPOPT_NOP;
- }
-+ if (TCP_MAXOLEN - optlen < TCPOLEN_MAXSEG)
-+ continue;
- optlen += TCPOLEN_MAXSEG;
- *optp++ = TCPOPT_MAXSEG;
- *optp++ = TCPOLEN_MAXSEG;
-@@ -1298,6 +1302,8 @@ tcp_addoptions(struct tcpopt *to, u_char
- optlen += TCPOLEN_NOP;
- *optp++ = TCPOPT_NOP;
- }
-+ if (TCP_MAXOLEN - optlen < TCPOLEN_WINDOW)
-+ continue;
- optlen += TCPOLEN_WINDOW;
- *optp++ = TCPOPT_WINDOW;
- *optp++ = TCPOLEN_WINDOW;
-@@ -1308,6 +1314,8 @@ tcp_addoptions(struct tcpopt *to, u_char
- optlen += TCPOLEN_NOP;
- *optp++ = TCPOPT_NOP;
- }
-+ if (TCP_MAXOLEN - optlen < TCPOLEN_SACK_PERMITTED)
-+ continue;
- optlen += TCPOLEN_SACK_PERMITTED;
- *optp++ = TCPOPT_SACK_PERMITTED;
- *optp++ = TCPOLEN_SACK_PERMITTED;
-@@ -1317,6 +1325,8 @@ tcp_addoptions(struct tcpopt *to, u_char
- optlen += TCPOLEN_NOP;
- *optp++ = TCPOPT_NOP;
- }
-+ if (TCP_MAXOLEN - optlen < TCPOLEN_TIMESTAMP)
-+ continue;
- optlen += TCPOLEN_TIMESTAMP;
- *optp++ = TCPOPT_TIMESTAMP;
- *optp++ = TCPOLEN_TIMESTAMP;
-@@ -1355,7 +1365,7 @@ tcp_addoptions(struct tcpopt *to, u_char
- optlen += TCPOLEN_NOP;
- *optp++ = TCPOPT_NOP;
- }
-- if (TCP_MAXOLEN - optlen < 2 + TCPOLEN_SACK)
-+ if (TCP_MAXOLEN - optlen < TCPOLEN_SACKHDR + TCPOLEN_SACK)
- continue;
- optlen += TCPOLEN_SACKHDR;
- *optp++ = TCPOPT_SACK;
-@@ -1386,9 +1396,15 @@ tcp_addoptions(struct tcpopt *to, u_char
- optlen += TCPOLEN_EOL;
- *optp++ = TCPOPT_EOL;
- }
-+ /*
-+ * According to RFC 793 (STD0007):
-+ * "The content of the header beyond the End-of-Option option
-+ * must be header padding (i.e., zero)."
-+ * and later: "The padding is composed of zeros."
-+ */
- while (optlen % 4) {
-- optlen += TCPOLEN_NOP;
-- *optp++ = TCPOPT_NOP;
-+ optlen += TCPOLEN_PAD;
-+ *optp++ = TCPOPT_PAD;
- }
-
- KASSERT(optlen <= TCP_MAXOLEN, ("%s: TCP options too long", __func__));
Deleted: trunk/kfreebsd-7/debian/patches/030_abi_cld.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/030_abi_cld.diff 2008-09-05 08:59:21 UTC (rev 2315)
+++ trunk/kfreebsd-7/debian/patches/030_abi_cld.diff 2008-09-12 08:26:02 UTC (rev 2316)
@@ -1,154 +0,0 @@
-diff -Nurd sys/amd64/amd64/machdep.c sys/amd64/amd64/machdep.c
---- src/sys/amd64/amd64/machdep.c 2008-01-19 19:15:01.000000000 +0100
-+++ src/sys/amd64/amd64/machdep.c 2008-03-06 01:29:07.000000000 +0100
-@@ -357,7 +357,7 @@
-
- regs->tf_rsp = (long)sfp;
- regs->tf_rip = PS_STRINGS - *(p->p_sysent->sv_szsigcode);
-- regs->tf_rflags &= ~PSL_T;
-+ regs->tf_rflags &= ~(PSL_T | PSL_D);
- regs->tf_cs = _ucodesel;
- PROC_LOCK(p);
- mtx_lock(&psp->ps_mtx);
-diff -Nurd sys/amd64/ia32/ia32_signal.c sys/amd64/ia32/ia32_signal.c
---- src/sys/amd64/ia32/ia32_signal.c 2006-10-05 03:56:10.000000000 +0200
-+++ src/sys/amd64/ia32/ia32_signal.c 2008-03-06 01:29:07.000000000 +0100
-@@ -391,7 +391,7 @@
-
- regs->tf_rsp = (uintptr_t)sfp;
- regs->tf_rip = FREEBSD32_PS_STRINGS - sz_freebsd4_ia32_sigcode;
-- regs->tf_rflags &= ~PSL_T;
-+ regs->tf_rflags &= ~(PSL_T | PSL_D);
- regs->tf_cs = _ucode32sel;
- regs->tf_ss = _udatasel;
- load_ds(_udatasel);
-@@ -511,7 +511,7 @@
-
- regs->tf_rsp = (uintptr_t)sfp;
- regs->tf_rip = FREEBSD32_PS_STRINGS - *(p->p_sysent->sv_szsigcode);
-- regs->tf_rflags &= ~PSL_T;
-+ regs->tf_rflags &= ~(PSL_T | PSL_D);
- regs->tf_cs = _ucode32sel;
- regs->tf_ss = _udatasel;
- load_ds(_udatasel);
-diff -Nurd sys/amd64/linux32/linux32_sysvec.c sys/amd64/linux32/linux32_sysvec.c
---- src/sys/amd64/linux32/linux32_sysvec.c 2007-09-20 15:46:26.000000000 +0200
-+++ src/sys/amd64/linux32/linux32_sysvec.c 2008-03-06 01:29:07.000000000 +0100
-@@ -402,7 +402,7 @@
- regs->tf_rsp = PTROUT(fp);
- regs->tf_rip = LINUX32_PS_STRINGS - *(p->p_sysent->sv_szsigcode) +
- linux_sznonrtsigcode;
-- regs->tf_rflags &= ~PSL_T;
-+ regs->tf_rflags &= ~(PSL_T | PSL_D);
- regs->tf_cs = _ucode32sel;
- regs->tf_ss = _udatasel;
- load_ds(_udatasel);
-@@ -524,7 +524,7 @@
- */
- regs->tf_rsp = PTROUT(fp);
- regs->tf_rip = LINUX32_PS_STRINGS - *(p->p_sysent->sv_szsigcode);
-- regs->tf_rflags &= ~PSL_T;
-+ regs->tf_rflags &= ~(PSL_T | PSL_D);
- regs->tf_cs = _ucode32sel;
- regs->tf_ss = _udatasel;
- load_ds(_udatasel);
-diff -Nurd sys/i386/i386/machdep.c sys/i386/i386/machdep.c
---- src/sys/i386/i386/machdep.c 2008-01-19 19:15:03.000000000 +0100
-+++ src/sys/i386/i386/machdep.c 2008-03-06 01:29:07.000000000 +0100
-@@ -416,7 +416,7 @@
-
- regs->tf_esp = (int)fp;
- regs->tf_eip = PS_STRINGS - szosigcode;
-- regs->tf_eflags &= ~PSL_T;
-+ regs->tf_eflags &= ~(PSL_T | PSL_D);
- regs->tf_cs = _ucodesel;
- regs->tf_ds = _udatasel;
- regs->tf_es = _udatasel;
-@@ -537,7 +537,7 @@
-
- regs->tf_esp = (int)sfp;
- regs->tf_eip = PS_STRINGS - szfreebsd4_sigcode;
-- regs->tf_eflags &= ~PSL_T;
-+ regs->tf_eflags &= ~(PSL_T | PSL_D);
- regs->tf_cs = _ucodesel;
- regs->tf_ds = _udatasel;
- regs->tf_es = _udatasel;
-@@ -673,7 +673,7 @@
-
- regs->tf_esp = (int)sfp;
- regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode);
-- regs->tf_eflags &= ~PSL_T;
-+ regs->tf_eflags &= ~(PSL_T | PSL_D);
- regs->tf_cs = _ucodesel;
- regs->tf_ds = _udatasel;
- regs->tf_es = _udatasel;
-diff -Nurd sys/i386/linux/linux_sysvec.c sys/i386/linux/linux_sysvec.c
---- src/sys/i386/linux/linux_sysvec.c 2007-09-20 15:46:26.000000000 +0200
-+++ src/sys/i386/linux/linux_sysvec.c 2008-03-06 01:29:07.000000000 +0100
-@@ -389,7 +389,7 @@
- regs->tf_esp = (int)fp;
- regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode) +
- linux_sznonrtsigcode;
-- regs->tf_eflags &= ~(PSL_T | PSL_VM);
-+ regs->tf_eflags &= ~(PSL_T | PSL_VM | PSL_D);
- regs->tf_cs = _ucodesel;
- regs->tf_ds = _udatasel;
- regs->tf_es = _udatasel;
-@@ -508,7 +508,7 @@
- */
- regs->tf_esp = (int)fp;
- regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode);
-- regs->tf_eflags &= ~(PSL_T | PSL_VM);
-+ regs->tf_eflags &= ~(PSL_T | PSL_VM | PSL_D);
- regs->tf_cs = _ucodesel;
- regs->tf_ds = _udatasel;
- regs->tf_es = _udatasel;
-diff -Nurd sys/i386/svr4/svr4_machdep.c sys/i386/svr4/svr4_machdep.c
---- src/sys/i386/svr4/svr4_machdep.c 2005-10-19 16:59:54.000000000 +0200
-+++ src/sys/i386/svr4/svr4_machdep.c 2008-03-06 01:29:07.000000000 +0100
-@@ -497,13 +497,13 @@
- svr4_szsigcode);
- tf->tf_cs = GSEL(GUSERLDT_SEL, SEL_UPL);
-
-- tf->tf_eflags &= ~(PSL_T|PSL_VM|PSL_AC);
-+ tf->tf_eflags &= ~(PSL_T|PSL_VM|PSL_AC|PSL_D);
- tf->tf_esp = (int)fp;
- tf->tf_ss = GSEL(GUSERLDT_SEL, SEL_UPL);
- #else
- tf->tf_esp = (int)fp;
- tf->tf_eip = (int)(((char *)PS_STRINGS) - *(p->p_sysent->sv_szsigcode));
-- tf->tf_eflags &= ~PSL_T;
-+ tf->tf_eflags &= ~(PSL_T | PSL_D);
- tf->tf_cs = _ucodesel;
- tf->tf_ds = _udatasel;
- tf->tf_es = _udatasel;
-diff -Nurd sys/pc98/pc98/machdep.c sys/pc98/pc98/machdep.c
---- src/sys/pc98/pc98/machdep.c 2008-01-19 19:15:05.000000000 +0100
-+++ src/sys/pc98/pc98/machdep.c 2008-03-06 01:29:07.000000000 +0100
-@@ -388,7 +388,7 @@
-
- regs->tf_esp = (int)fp;
- regs->tf_eip = PS_STRINGS - szosigcode;
-- regs->tf_eflags &= ~PSL_T;
-+ regs->tf_eflags &= ~(PSL_T | PSL_D);
- regs->tf_cs = _ucodesel;
- regs->tf_ds = _udatasel;
- regs->tf_es = _udatasel;
-@@ -509,7 +509,7 @@
-
- regs->tf_esp = (int)sfp;
- regs->tf_eip = PS_STRINGS - szfreebsd4_sigcode;
-- regs->tf_eflags &= ~PSL_T;
-+ regs->tf_eflags &= ~(PSL_T | PSL_D);
- regs->tf_cs = _ucodesel;
- regs->tf_ds = _udatasel;
- regs->tf_es = _udatasel;
-@@ -645,7 +645,7 @@
-
- regs->tf_esp = (int)sfp;
- regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode);
-- regs->tf_eflags &= ~PSL_T;
-+ regs->tf_eflags &= ~(PSL_T | PSL_D);
- regs->tf_cs = _ucodesel;
- regs->tf_ds = _udatasel;
- regs->tf_es = _udatasel;
More information about the Glibc-bsd-commits
mailing list