From: Tim Yamin Date: Thu, 21 Oct 2004 18:33:36 +0000 (+0000) Subject: Version bumped to address CAN-2004-0816; bug #68375. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2865472d246d08779ab6417913550f57b540efa;p=gentoo.git Version bumped to address CAN-2004-0816; bug #68375. --- diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog index 98d70f57bbaa..cb6a6c716bf8 100644 --- a/sys-kernel/win4lin-sources/ChangeLog +++ b/sys-kernel/win4lin-sources/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-kernel/win4lin-sources # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.36 2004/08/26 01:14:37 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.37 2004/10/21 18:33:36 plasmaroo Exp $ + +*win4lin-sources-2.6.7-r6 (21 Oct 2004) + + 21 Oct 2004; -win4lin-sources-2.6.7-r5.ebuild, + +win4lin-sources-2.6.7-r6.ebuild, + +files/win4lin-sources-2.6.CAN-2004-0816.patch: + Version bumped to address CAN-2004-0816; bug #68375. 26 Aug 2004; win4lin-sources-2.6.7-r5.ebuild: Marking the 2.6 version as "~x86"; bug #55587. diff --git a/sys-kernel/win4lin-sources/Manifest b/sys-kernel/win4lin-sources/Manifest index 91c84e9c2532..41fae6ceadad 100644 --- a/sys-kernel/win4lin-sources/Manifest +++ b/sys-kernel/win4lin-sources/Manifest @@ -1,12 +1,13 @@ -MD5 a2b1414930d586ccff0493e37e795eaf ChangeLog 7525 -MD5 250731543201b99c754b73bf9d71bf69 win4lin-sources-2.6.7-r5.ebuild 1532 +MD5 8deefecf39c704e907c2c42f810b7b4b ChangeLog 7780 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290 +MD5 014ba03b3e63507d68b4ea6c5ad65296 win4lin-sources-2.6.7-r6.ebuild 1575 MD5 1bcdac5843dca353edd3fdd3ab7d787f win4lin-sources-2.4.26-r6.ebuild 2051 -MD5 6d3c92f001f307906b42c86de91d8fd0 files/digest-win4lin-sources-2.6.7-r5 283 +MD5 6d3c92f001f307906b42c86de91d8fd0 files/digest-win4lin-sources-2.6.7-r6 283 MD5 8204afea1d572b49a4a80d8da4eef0c9 files/win4lin-sources-2.6.CAN-2004-0596.patch 1033 MD5 c2510fe1891f5a9effb12c2196922206 files/win4lin-sources-2.6.cmdlineLeak.patch 281 MD5 c9da1bc82b906f6abc648c056e7bf662 files/win4lin-sources-2.4.26.FPULockup-53804.patch 354 MD5 d1ccc2047be533c992f67270a150a210 files/win4lin-sources-2.4.26.cmdlineLeak.patch 388 +MD5 aa595005721b58929ee55e2e8f4b6ba0 files/win4lin-sources-2.6.CAN-2004-0816.patch 1693 MD5 dc18e982f8149588a291956481885a8c files/win4lin-sources-2.4.26.CAN-2004-0495.patch 17549 MD5 60d25ff310fc6abfdce39ec9e47345af files/win4lin-sources-2.4.26.CAN-2004-0685.patch 2809 MD5 39361f8d16b1fe5891aab62e92f8cd30 files/win4lin-sources-2.6.IPTables-RDoS.patch 390 diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r5 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r6 similarity index 100% rename from sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r5 rename to sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r6 diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.CAN-2004-0816.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.CAN-2004-0816.patch new file mode 100644 index 000000000000..13a9ea2f5aa4 --- /dev/null +++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.CAN-2004-0816.patch @@ -0,0 +1,43 @@ +Subject: Prevent ICMP crash in netfilter logging +From: Olaf Kirch +References: 46016 + +This patch fixes a remotely triggerable crash in the netfilter code +when looking at ICMP unreachables. It dies when trying to copy +BIGNUM bytes... + +Index: linux-2.6.5/net/ipv4/netfilter/ipt_LOG.c +=================================================================== +--- linux-2.6.5.orig/net/ipv4/netfilter/ipt_LOG.c 2004-02-19 11:36:37.000000000 +0100 ++++ linux-2.6.5/net/ipv4/netfilter/ipt_LOG.c 2004-09-24 15:48:54.000000000 +0200 +@@ -71,7 +71,7 @@ + printk("FRAG:%u ", ntohs(iph.frag_off) & IP_OFFSET); + + if ((info->logflags & IPT_LOG_IPOPT) +- && iph.ihl * 4 != sizeof(struct iphdr)) { ++ && iph.ihl * 4 > sizeof(struct iphdr)) { + unsigned char opt[4 * 15 - sizeof(struct iphdr)]; + unsigned int i, optsize; + +@@ -138,7 +138,7 @@ + printk("URGP=%u ", ntohs(tcph.urg_ptr)); + + if ((info->logflags & IPT_LOG_TCPOPT) +- && tcph.doff * 4 != sizeof(struct tcphdr)) { ++ && tcph.doff * 4 > sizeof(struct tcphdr)) { + unsigned char opt[4 * 15 - sizeof(struct tcphdr)]; + unsigned int i, optsize; + +Index: linux-2.6.5/net/ipv6/netfilter/ip6t_LOG.c +=================================================================== +--- linux-2.6.5.orig/net/ipv6/netfilter/ip6t_LOG.c 2004-09-24 15:47:00.000000000 +0200 ++++ linux-2.6.5/net/ipv6/netfilter/ip6t_LOG.c 2004-09-24 15:48:35.000000000 +0200 +@@ -188,7 +188,7 @@ + printk("URGP=%u ", ntohs(tcph->urg_ptr)); + + if ((info->logflags & IP6T_LOG_TCPOPT) +- && tcph->doff * 4 != sizeof(struct tcphdr)) { ++ && tcph->doff * 4 > sizeof(struct tcphdr)) { + unsigned int i; + + /* Max length: 127 "OPT (" 15*4*2chars ") " */ diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r5.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r6.ebuild similarity index 90% rename from sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r5.ebuild rename to sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r6.ebuild index b108b0cdb907..79ea80a46e11 100644 --- a/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r5.ebuild +++ b/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r5.ebuild,v 1.3 2004/08/26 01:14:37 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r6.ebuild,v 1.1 2004/10/21 18:33:36 plasmaroo Exp $ ETYPE="sources" inherit kernel-2 @@ -15,7 +15,8 @@ UNIPATCH_LIST=" ${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch ${FILESDIR}/${PN}-2.6.ProcPerms.patch - ${FILESDIR}/${PN}-2.6.cmdlineLeak.patch" + ${FILESDIR}/${PN}-2.6.cmdlineLeak.patch + ${FILESDIR}/${PN}-2.6.CAN-2004-0816.patch" S=${WORKDIR}/linux-${KV}