diff options
author | Greg Kroah-Hartman <gregkh@gentoo.org> | 2004-07-04 18:00:44 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@gentoo.org> | 2004-07-04 18:00:44 +0000 |
commit | 5711d05250b2ca99e72b5570d7468375a17a2a09 (patch) | |
tree | 077d7564a0960d3459773a2f28da2be69fcd490d /sys-kernel/gaming-sources | |
parent | Stable on ppc. (diff) | |
download | historical-5711d05250b2ca99e72b5570d7468375a17a2a09.tar.gz historical-5711d05250b2ca99e72b5570d7468375a17a2a09.tar.bz2 historical-5711d05250b2ca99e72b5570d7468375a17a2a09.zip |
removed sys-kernel/gaming-sources
as per bug 56068
Diffstat (limited to 'sys-kernel/gaming-sources')
23 files changed, 0 insertions, 1793 deletions
diff --git a/sys-kernel/gaming-sources/ChangeLog b/sys-kernel/gaming-sources/ChangeLog deleted file mode 100644 index 1a090157064c..000000000000 --- a/sys-kernel/gaming-sources/ChangeLog +++ /dev/null @@ -1,149 +0,0 @@ -# ChangeLog for sys-kernel/gaming-sources -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.28 2004/06/24 22:56:17 agriffis Exp $ - -*gaming-sources-2.4.20-r14 (24 Jun 2004) - - 24 Jun 2004; <plasmaroo@gentoo.org> -gaming-sources-2.4.20-r13.ebuild, - +gaming-sources-2.4.20-r14.ebuild, - +files/gaming-sources-2.4.20.CAN-2004-0495.patch, - +files/gaming-sources-2.4.20.CAN-2004-0535.patch: - Security bump for the CAN-2004-0495 and CAN-2004-0535 vulnerabilities. - Old version removed. - -*gaming-sources-2.4.20-r13 (19 Jun 2004) - - 19 Jun 2004; <plasmaroo@gentoo.org> -gaming-sources-2.4.20-r12.ebuild, - +gaming-sources-2.4.20-r13.ebuild, - +files/gaming-sources-2.4.20.I2C_Limits.patch: - Added a patch to add in missing I2C sanity checks that were added upstream in - 2.4.21. - -*gaming-sources-2.4.20-r12 (14 Jun 2004) - - 14 Jun 2004; <plasmaroo@gentoo.org> +gaming-sources-2.4.20-r12.ebuild, - +files/gaming-sources-2.4.20.FPULockup-53804.patch - Added a patch for the FPU-lockup issue; please see bug #58304 for details. - Old version removed. - - 31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> - gaming-sources-2.4.20-r11.ebuild: - Masked gaming-sources-2.4.20-r11.ebuild broken for ppc - -*gaming-sources-2.4.20-r11 (29 May 2004) - - 29 May 2004; <plasmaroo@gentoo.org> -gaming-sources-2.4.20-r10.ebuild, - +gaming-sources-2.4.20-r11.ebuild, -gaming-sources-2.4.20-r5.ebuild, - +files/gaming-sources-2.4.20.CAN-2004-0133.patch, - +files/gaming-sources-2.4.20.CAN-2004-0181.patch, - +files/gaming-sources-2.4.20.CAN-2004-0394.patch, - +files/gaming-sources-2.4.20.CAN-2004-0427.patch: - Added patches for the CAN-2004-0133, CAN-2004-0181, CAN-2004-0394 and - CAN-2004-0427 vulnerabilities. Bug #47881. Old versions of sources - removed. - - 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> - gaming-sources-2.4.20-r5.ebuild: - Add inherit eutils. - -*gaming-sources-2.4.20-r10 (17 Apr 2004) - - 17 Apr 2004; <plasmaroo@gentoo.org> - +files/gaming-sources-2.4.20.CAN-2004-0010.patch, - +files/gaming-sources-2.4.20.CAN-2004-0177.patch, - +files/gaming-sources-2.4.20.CAN-2004-0178.patch, - +gaming-sources-2.4.20-r10.ebuild, -gaming-sources-2.4.20-r9.ebuild: - Added patches for the CAN-2004-0010, CAN-2004-0177 and CAN-2004-0178 - vulnerabilities. - - 15 Apr 2004; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r9.ebuild, - files/gaming-sources-2.4.20.CAN-2004-0109.patch: - Version bump for the CAN-2004-0109 issue; bug #47881. - - 12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> - gaming-sources-2.4.20-r8.ebuild: - Add eutils to inherit. - -*gaming-sources-2.4.20-r8 (18 Feb 2004) - - 18 Feb 2004; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r8.ebuild, - files/gaming-sources-2.4.20.munmap.patch: - Added the patch for the mremap/munmap vulnerability. Bug #42024. - - 16 Feb 2004; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r7.ebuild, - files/gaming-sources-2.4.20.CAN-2004-0001.patch: - Added the fix for the ptrace vulnerability for AMD64 platforms. - - 21 Jan 2004; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r7.ebuild: - Changed the CK patch to -ck7; this should solve any problems for those - getting packet writing problems. Closes bug #22796. - -*gaming-sources-2.4.20-r7 (06 Jan 2004) - - 06 Jan 2004; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r7.ebuild, - files/gaming-sources-2.4.20.CAN-2003-0985.patch, - files/gaming-sources-2.4.20.rtc_fix.patch: - Added patches to address the security vulnerabilities in bugs #37292 and - #37317. - - 04 Dec 2003; Brian Jackson <iggy@gentoo.org> - gaming-sources-2.4.20-r5.ebuild, gaming-sources-2.4.20-r6.ebuild: - updated keywords per Admiral Genone's orders - - 01 Dec 2003; Brian Jackson <iggy@gentoo.org> - gaming-sources-2.4.20-r1.ebuild, gaming-sources-2.4.20-r2.ebuild, - gaming-sources-2.4.20-r3.ebuild, gaming-sources-2.4.20-r4.ebuild, - gaming-sources-2.4.20-r5.ebuild, gaming-sources-2.4.20-r6.ebuild, - files/do_brk_fix.patch: Fix the 'do_brk' vulnerability. - -*gaming-sources-2.4.20-r6 (28 Oct 2003) - - 28 Oct 2003; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r6.ebuild, - files/gaming-sources-2.4.20-gcc33.patch: - Added the GCC 3.3 patches, thus a version bump. - -gaming-sources-2.4.20-r5 (11 June 2003) - - 28 Oct 2003; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r5.ebuild: - Added fix for the bogus line in the fealnx driver. - - 07 Aug 2003; John Mylchreest <johnm@gentoo.org>; - gaming-sources-2.4.20-r3.ebuild, gaming-sources-2.4.20-r5.ebuild: - Fixing security issue with /tmp/KV. - - 11 June 2003; Bob Johnson <livewire@gentoo.org>: new 2.4.20-r5 - - - Fixed via agpgart compile. - -gaming-sources-2.4.20-r4 (08 June 2003) - - 08 June 2003; Daniel Robbins <drobbins@gentoo.org>: new 2.4.20-r4 - gaming-sources with a patch from 2.4.21_rc6-gss that includes AGPGART support - for nforce2 chipsets. Also added a note to the configure options about the DRI - kernel modules being old and that "emerge xfree-drm" should be used instead. - -gaming-sources-2.4.20-r3 (30 April 2003) - - 30 April 2003; Bob Johnson <livewire@gentoo.org> -gcc31 default optimizations - have been changed to -O2 (pfeifer@gentoo.org) - -*gaming-sources-2.4.20-r2 (20 April 2003) - - 16 April 2003; Bob Johnson <livewire@gentoo.org> - - - New bootsplash patches - - Bumped back down to -ck4 for performance - -*gaming-sources-2.4.20-r1 (11 Mar 2003) - - 30 Mar 2003; Bob Johnson <livewire@gentoo.org> - - - Added bootsplash patch - - Add vmware framebuffer patch - - Add kernel hacks for extra quiet kernel messages (append = quiet) - for LiveCD. - - 11 Mar 2003; Seemant Kulleen <seemant@gentoo.org> ChangeLog : - - Added ChangeLog to gaming-sources. - diff --git a/sys-kernel/gaming-sources/Manifest b/sys-kernel/gaming-sources/Manifest deleted file mode 100644 index 5352e5c8d98c..000000000000 --- a/sys-kernel/gaming-sources/Manifest +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 1b3bbb48ef59cb89245f33bd4f16ab52 ChangeLog 5679 -MD5 117583a1ac61683453f3ef6d5caf7337 gaming-sources-2.4.20-r14.ebuild 2612 -MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290 -MD5 1167bc6f9dd7add4edb8041755be6b63 files/digest-gaming-sources-2.4.20-r14 216 -MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242 -MD5 3a84a13cd1ae6324e4f754c05a77cb34 files/gaming-sources-2.4.20-gcc33.patch 12143 -MD5 e77a93fdf26f06cf3ea5080b27211725 files/gaming-sources-2.4.20.CAN-2003-0985.patch 414 -MD5 df40eece807d039cba79f477e80ebda2 files/gaming-sources-2.4.20.rtc_fix.patch 4974 -MD5 bf2b609e8cab6460d220b1267db09826 files/gaming-sources-2.4.20.CAN-2004-0001.patch 982 -MD5 174438d215b70cad5ffb00ca8123c062 files/gaming-sources-2.4.20.munmap.patch 837 -MD5 21f3a4f186017d925067335e24db36a1 files/gaming-sources-2.4.20.CAN-2004-0109.patch 1877 -MD5 147fec50180ad91b6260fc7201dcb90f files/gaming-sources-2.4.20.CAN-2004-0010.patch 6050 -MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/gaming-sources-2.4.20.CAN-2004-0177.patch 384 -MD5 ac42024b6e6ee1e2165914db4b22a61c files/gaming-sources-2.4.20.CAN-2004-0178.patch 424 -MD5 5bf9836a632a861728d33f9736bb7431 files/gaming-sources-2.4.20.CAN-2004-0133.patch 427 -MD5 39af009b63a2f2042ac251fa801044d9 files/gaming-sources-2.4.20.CAN-2004-0181.patch 1180 -MD5 d4a740ae56c2049247083af387a22a85 files/gaming-sources-2.4.20.CAN-2004-0394.patch 350 -MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gaming-sources-2.4.20.CAN-2004-0427.patch 460 -MD5 dc18e982f8149588a291956481885a8c files/gaming-sources-2.4.20.CAN-2004-0495.patch 17549 -MD5 0f66013f643c79c97fda489618a4e2fd files/gaming-sources-2.4.20.CAN-2004-0535.patch 476 -MD5 c9da1bc82b906f6abc648c056e7bf662 files/gaming-sources-2.4.20.FPULockup-53804.patch 354 -MD5 e30386f1121b1197396ed9082eae7dcb files/gaming-sources-2.4.20.I2C_Limits.patch 1037 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.8 (GNU/Linux) - -iD8DBQFA6DKIHTu7gpaalycRApavAJ9CHUbPA1ffft8t0muhf5647QZhWgCfbjEb -td6LT6uN46/fNaBHweHyFgQ= -=B1Vd ------END PGP SIGNATURE----- diff --git a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r14 b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r14 deleted file mode 100644 index bb133846e255..000000000000 --- a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r14 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046 -MD5 b8d7ca0e2c2df2642e919b03e266cdeb patches-2.4.20-gaming-r5.tar.bz2 381905 -MD5 0b0472793f452cd2e8c468eee44dca36 linux-2.4.20-ck7.patch.bz2 1308575 diff --git a/sys-kernel/gaming-sources/files/do_brk_fix.patch b/sys-kernel/gaming-sources/files/do_brk_fix.patch deleted file mode 100644 index fef1f1e981e2..000000000000 --- a/sys-kernel/gaming-sources/files/do_brk_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/mm/mmap.c Fri Sep 12 06:44:06 2003 -+++ b/mm/mmap.c Thu Oct 2 01:18:19 2003 -@@ -1041,6 +1041,9 @@ - if (!len) - return addr; - -+ if ((addr + len) > TASK_SIZE || (addr + len) < addr) -+ return -EINVAL; -+ - /* - * mlock MCL_FUTURE? - */ diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20-gcc33.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20-gcc33.patch deleted file mode 100644 index fbabd304c80c..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20-gcc33.patch +++ /dev/null @@ -1,249 +0,0 @@ -diff -u -r linux-2.4.20-gaming-r5/arch/arm/mach-integrator/pci_v3.c linux-2.4.20-gaming-r6/arch/arm/mach-integrator/pci_v3.c ---- linux-2.4.20-gaming-r5/arch/arm/mach-integrator/pci_v3.c 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/arch/arm/mach-integrator/pci_v3.c 2003-09-11 17:32:50.000000000 +0100 -@@ -629,7 +629,6 @@ - #if 0 - ret = request_irq(IRQ_LBUSTIMEOUT, lb_timeout, 0, "bus timeout", NULL); - if (ret) -- printk(KERN_ERR "PCI: unable to grab local bus timeout ". -- "interrupt: %d\n", ret); -+ printk(KERN_ERR "PCI: unable to grab local bus timeout interrupt: %d\n", ret); - #endif - } -diff -u -r linux-2.4.20-gaming-r5/arch/mips64/mm/r4xx0.c linux-2.4.20-gaming-r6/arch/mips64/mm/r4xx0.c ---- linux-2.4.20-gaming-r5/arch/mips64/mm/r4xx0.c 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/arch/mips64/mm/r4xx0.c 2003-09-11 17:32:50.000000000 +0100 -@@ -1941,9 +1941,8 @@ - #ifdef DEBUG_TLB - if((pid != (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff)) || - (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) == 0)) { -- printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d -- tlbpid=%d\n", (int) (CPU_CONTEXT(smp_processor_id(), -- vma->vm_mm) & 0xff), pid); -+ printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d tlbpid=%d\n", -+ (int) (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff), pid); - } - #endif - -diff -u -r linux-2.4.20-gaming-r5/arch/mips64/mm/tlb-r4k.c linux-2.4.20-gaming-r6/arch/mips64/mm/tlb-r4k.c ---- linux-2.4.20-gaming-r5/arch/mips64/mm/tlb-r4k.c 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/arch/mips64/mm/tlb-r4k.c 2003-09-11 17:32:50.000000000 +0100 -@@ -200,9 +200,8 @@ - #ifdef DEBUG_TLB - if((pid != (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff)) || - (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) == 0)) { -- printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d -- tlbpid=%d\n", (int) (CPU_CONTEXT(smp_processor_id(), -- vma->vm_mm) & 0xff), pid); -+ printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d tlbpid=%d\n", -+ (int) (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff), pid); - } - #endif - -diff -u -r linux-2.4.20-gaming-r5/drivers/atm/zatm.c linux-2.4.20-gaming-r6/drivers/atm/zatm.c ---- linux-2.4.20-gaming-r5/drivers/atm/zatm.c 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/drivers/atm/zatm.c 2003-09-11 17:32:50.000000000 +0100 -@@ -1430,8 +1430,7 @@ - zout(uPD98401_GMR_ONE | uPD98401_BURST8 | uPD98401_BURST4 | - uPD98401_BURST2 | uPD98401_GMR_PM | uPD98401_GMR_DR,GMR); - /* TODO: should shrink allocation now */ -- printk("mem=%dkB,%s (",zatm_dev->mem >> 10,zatm_dev->copper ? "UTP" : -- "MMF"); -+ printk("mem=%dkB,%s (",zatm_dev->mem >> 10,zatm_dev->copper ? "UTP" : "MMF"); - for (i = 0; i < ESI_LEN; i++) - printk("%02X%s",dev->esi[i],i == ESI_LEN-1 ? ")\n" : "-"); - do { -diff -u -r linux-2.4.20-gaming-r5/drivers/char/h8.c linux-2.4.20-gaming-r6/drivers/char/h8.c ---- linux-2.4.20-gaming-r5/drivers/char/h8.c 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/drivers/char/h8.c 2003-09-11 17:32:50.000000000 +0100 -@@ -574,8 +574,7 @@ - } - - if (intrbuf.word & H8_POWER_BUTTON) { -- printk(KERN_CRIT "Power switch pressed - please wait - preparing to power --off\n"); -+ printk(KERN_CRIT "Power switch pressed - please wait - preparing to power off\n"); - h8_set_event_mask(H8_POWER_BUTTON); - wake_up(&h8_monitor_wait); - } -diff -u -r linux-2.4.20-gaming-r5/drivers/ide/ide-cd.h linux-2.4.20-gaming-r6/drivers/ide/ide-cd.h ---- linux-2.4.20-gaming-r5/drivers/ide/ide-cd.h 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/drivers/ide/ide-cd.h 2003-09-11 17:32:50.000000000 +0100 -@@ -437,7 +437,7 @@ - - byte curlba[3]; - byte nslots; -- __u8 short slot_tablelen; -+ __u16 slot_tablelen; - }; - - -diff -u -r linux-2.4.20-gaming-r5/drivers/net/bcm4400/b44.h linux-2.4.20-gaming-r6/drivers/net/bcm4400/b44.h ---- linux-2.4.20-gaming-r5/drivers/net/bcm4400/b44.h 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/drivers/net/bcm4400/b44.h 2003-09-11 21:37:04.000000000 +0100 -@@ -1079,10 +1079,10 @@ - /******************************************************************************/ - - #define REG_RD(pDevice, OffsetName) \ -- __raw_readl(&((pDevice)->pMemView->##OffsetName)) -+ __raw_readl(&((pDevice)->pMemView->OffsetName)) - - #define REG_WR(pDevice, OffsetName, Value32) \ -- (void) __raw_writel(Value32, &((pDevice)->pMemView->##OffsetName)) -+ (void) __raw_writel(Value32, &((pDevice)->pMemView->OffsetName)) - - #define REG_RD_OFFSET(pDevice, Offset) \ - __raw_readl(((LM_UINT8 *) (pDevice)->pMemView + Offset)) -diff -u -r linux-2.4.20-gaming-r5/drivers/net/tokenring/olympic.c linux-2.4.20-gaming-r6/drivers/net/tokenring/olympic.c ---- linux-2.4.20-gaming-r5/drivers/net/tokenring/olympic.c 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/drivers/net/tokenring/olympic.c 2003-09-11 17:32:50.000000000 +0100 -@@ -655,8 +655,8 @@ - printk(" stat_ring[7]: %p\n", &(olympic_priv->olympic_rx_status_ring[7]) ); - - printk("RXCDA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCDA),&olympic_priv->olympic_rx_ring[0]); -- printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr = --%08x\n",olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ; -+ printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr = %08x\n", -+ olympic_priv->rx_ring_dma_addr, olympic_priv->rx_status_ring_dma_addr) ; - #endif - - writew((((readw(olympic_mmio+RXENQ)) & 0x8000) ^ 0x8000) | i,olympic_mmio+RXENQ); -diff -u -r linux-2.4.20-gaming-r5/drivers/scsi/sun3_NCR5380.c linux-2.4.20-gaming-r6/drivers/scsi/sun3_NCR5380.c ---- linux-2.4.20-gaming-r5/drivers/scsi/sun3_NCR5380.c 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/drivers/scsi/sun3_NCR5380.c 2003-09-11 17:32:50.000000000 +0100 -@@ -1226,8 +1226,7 @@ - BASR_ACK)) == - (BASR_PHASE_MATCH | BASR_ACK)) { - printk("scsi%d: BASR %02x\n", HOSTNO, NCR5380_read(BUS_AND_STATUS_REG)); -- printk("scsi%d: bus stuck in data phase -- probably a -- single byte overrun!\n", HOSTNO); -+ printk("scsi%d: bus stuck in data phase -- probably a single byte overrun!\n", HOSTNO); - printk("not prepared for this error!\n"); - printk("please e-mail sammy@sammy.net with a description of how this\n"); - printk("error was produced.\n"); -diff -u -r linux-2.4.20-gaming-r5/fs/reiserfs/super.c linux-2.4.20-gaming-r6/fs/reiserfs/super.c ---- linux-2.4.20-gaming-r5/fs/reiserfs/super.c 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/fs/reiserfs/super.c 2003-09-11 17:32:50.000000000 +0100 -@@ -941,8 +941,7 @@ - ll_rw_block(READ, 1, &(SB_AP_BITMAP(s)[i].bh)) ; - wait_on_buffer(SB_AP_BITMAP(s)[i].bh) ; - if (!buffer_uptodate(SB_AP_BITMAP(s)[i].bh)) { -- printk("reread_meta_blocks, error reading bitmap block number %d at -- %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ; -+ printk("reread_meta_blocks, error reading bitmap block number %d at %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ; - return 1 ; - } - } -diff -u -r linux-2.4.20-gaming-r5/net/core/rtnetlink.c linux-2.4.20-gaming-r6/net/core/rtnetlink.c ---- linux-2.4.20-gaming-r5/net/core/rtnetlink.c 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/net/core/rtnetlink.c 2003-09-11 17:32:50.000000000 +0100 -@@ -394,7 +394,7 @@ - * Malformed skbs with wrong lengths of messages are discarded silently. - */ - --extern __inline__ int rtnetlink_rcv_skb(struct sk_buff *skb) -+__inline__ int rtnetlink_rcv_skb(struct sk_buff *skb) - { - int err; - struct nlmsghdr * nlh; -diff -u -r linux-2.4.20-gaming-r5/net/decnet/dn_table.c linux-2.4.20-gaming-r6/net/decnet/dn_table.c ---- linux-2.4.20-gaming-r5/net/decnet/dn_table.c 2003-09-10 23:36:03.000000000 +0100 -+++ linux-2.4.20-gaming-r6/net/decnet/dn_table.c 2003-09-11 17:32:50.000000000 +0100 -@@ -836,8 +836,7 @@ - return NULL; - - if (in_interrupt() && net_ratelimit()) { -- printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table --from interrupt\n"); -+ printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table from interrupt\n"); - return NULL; - } - if ((t = kmalloc(sizeof(struct dn_fib_table), GFP_KERNEL)) == NULL) - -diff -u -r linux-2.4.20-gaming-r5/drivers/net/fealnx.c linux-2.4.20-gaming-r6/drivers/net/fealnx.c ---- linux-2.4.20-gaming-r5/drivers/net/fealnx.c 2003-09-08 19:50:27.000000000 -0700 -+++ linux-2.4.20-gaming-r6/drivers/net/fealnx.c 2003-06-13 07:51:34.000000000 -0700 -@@ -937,7 +937,7 @@ - // 89/9/1 modify, - // np->bcrvalue=0x38; - np->bcrvalue = 0x10; -- np->cralue = 0xe00; /* rx 128 burst length */ -+ np->crvalue = 0xe00; /* rx 128 burst length */ - #warning Processor architecture undefined! - #endif - // 89/12/29 add, -@@ -1198,7 +1198,6 @@ - printk("\n"); - } - -- + dev->if_port = np->default_port; - /* Reinit. Gross */ - - /* Reset the chip's Tx and Rx processes. */ -diff -u -r linux-2.4.20-gaming-r5/drivers/net/irda/ma600.c linux-2.4.20-gaming-r6/drivers/net/irda/ma600.c ---- linux-2.4.20-gaming-r5/drivers/net/irda/ma600.c 2003-09-08 19:50:27.000000000 -0700 -+++ linux-2.4.20-gaming-r6/drivers/net/irda/ma600.c 2003-08-25 04:44:42.000000000 -0700 -@@ -51,9 +51,9 @@ - #undef ASSERT(expr, func) - #define ASSERT(expr, func) \ - if(!(expr)) { \ -- printk( "Assertion failed! %s,%s,%s,line=%d\n",\ -- #expr,__FILE__,__FUNCTION__,__LINE__); \ -- ##func} -+ printk( "Assertion failed! %s,%s,%s,line=%d\n",\ -+ #expr,__FILE__,__FUNCTION__,__LINE__); \ -+ func} - #endif - - /* convert hex value to ascii hex */ -diff -u -r linux-2.4.20-gaming-r5/arch/i386/math-emu/poly.h linux-2.4.20-gaming-r6/arch/i386/math-emu/poly.h ---- linux-2.4.20-gaming-r5/arch/i386/math-emu/poly.h 2003-09-08 19:52:14.000000000 -0700 -+++ linux-2.4.20-gaming-r6/arch/i386/math-emu/poly.h 2003-09-08 19:45:38.000000000 -0700 -@@ -75,11 +75,11 @@ - /* Add the 12 byte Xsig x2 to Xsig dest, with no checks for overflow. */ - static inline void add_Xsig_Xsig(Xsig *dest, const Xsig *x2) - { -- asm volatile ("movl %1,%%edi; movl %2,%%esi; -- movl (%%esi),%%eax; addl %%eax,(%%edi); -- movl 4(%%esi),%%eax; adcl %%eax,4(%%edi); -- movl 8(%%esi),%%eax; adcl %%eax,8(%%edi);" -- :"=g" (*dest):"g" (dest), "g" (x2) -+ asm volatile ("movl %1,%%edi; movl %2,%%esi; " \ -+ "movl (%%esi),%%eax; addl %%eax,(%%edi); " \ -+ "movl 4(%%esi),%%eax; adcl %%eax,4(%%edi); " \ -+ "movl 8(%%esi),%%eax; adcl %%eax,8(%%edi); " \ -+ :"=g" (*dest):"g" (dest), "g" (x2) \ - :"ax","si","di"); - } - -@@ -90,18 +90,18 @@ - problem, but keep fingers crossed! */ - static inline void add_two_Xsig(Xsig *dest, const Xsig *x2, long int *exp) - { -- asm volatile ("movl %2,%%ecx; movl %3,%%esi; -- movl (%%esi),%%eax; addl %%eax,(%%ecx); -- movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx); -- movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx); -- jnc 0f; -- rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx) -- movl %4,%%ecx; incl (%%ecx) -- movl $1,%%eax; jmp 1f; -- 0: xorl %%eax,%%eax; -- 1:" -- :"=g" (*exp), "=g" (*dest) -- :"g" (dest), "g" (x2), "g" (exp) -+ asm volatile ("movl %2,%%ecx; movl %3,%%esi; " \ -+ "movl (%%esi),%%eax; addl %%eax,(%%ecx); " \ -+ "movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx); " \ -+ "movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx); " \ -+ "jnc 0f; " \ -+ "rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx); " \ -+ "movl %4,%%ecx; incl (%%ecx); " \ -+ "movl $1,%%eax; jmp 1f; " \ -+ "0: xorl %%eax,%%eax; " \ -+ "1: " \ -+ :"=g" (*exp), "=g" (*dest) \ -+ :"g" (dest), "g" (x2), "g" (exp) \ - :"cx","si","ax"); - } - diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2003-0985.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2003-0985.patch deleted file mode 100644 index dacf6ed810f9..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2003-0985.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- linux/mm/mremap.c.orig 2004-01-05 17:01:21.382104120 +0000 -+++ linux/mm/mremap.c 2004-01-05 17:15:25.689749848 +0000 -@@ -315,6 +315,10 @@ - old_len = PAGE_ALIGN(old_len); - new_len = PAGE_ALIGN(new_len); - -+ /* Don't allow the degenerate cases */ -+ if (!old_len || !new_len) -+ goto out; -+ - /* new_addr is only valid if MREMAP_FIXED is specified */ - if (flags & MREMAP_FIXED) { - if (new_addr & ~PAGE_MASK) diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0001.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0001.patch deleted file mode 100644 index bb51f9aa9a62..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0001.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -u linux/arch/x86_64/ia32/ptrace32.c-PTRACE linux/arch/x86_64/ia32/ptrace32.c ---- linux/arch/x86_64/ia32/ptrace32.c-PTRACE 2003-06-16 13:03:58.000000000 +0200 -+++ linux/arch/x86_64/ia32/ptrace32.c 2004-01-07 18:04:43.000000000 +0100 -@@ -25,6 +25,10 @@ - #include <asm/fpu32.h> - #include <linux/mm.h> - -+/* determines which flags the user has access to. */ -+/* 1 = access 0 = no access */ -+#define FLAG_MASK 0x44dd5UL -+ - #define R32(l,q) \ - case offsetof(struct user32, regs.l): stack[offsetof(struct pt_regs, q)/8] = val; break - -@@ -69,9 +73,12 @@ - R32(eip, rip); - R32(esp, rsp); - -- case offsetof(struct user32, regs.eflags): -- stack[offsetof(struct pt_regs, eflags)/8] = val & 0x44dd5; -+ case offsetof(struct user32, regs.eflags): { -+ __u64 *flags = &stack[offsetof(struct pt_regs, eflags)/8]; -+ val &= FLAG_MASK; -+ *flags = val | (*flags & ~FLAG_MASK); - break; -+ } - - case offsetof(struct user32, u_debugreg[4]): - case offsetof(struct user32, u_debugreg[5]): diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0010.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0010.patch deleted file mode 100644 index 6b4b1cefa49e..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0010.patch +++ /dev/null @@ -1,200 +0,0 @@ -diff -urN linux-2.4.25-pre6/fs/ncpfs/dir.c linux-2.4.25-pre7/fs/ncpfs/dir.c ---- linux-2.4.25-pre6/fs/ncpfs/dir.c 2002-11-28 15:53:15.000000000 -0800 -+++ linux-2.4.25-pre7/fs/ncpfs/dir.c 2004-01-23 10:53:26.000000000 -0800 -@@ -266,8 +266,8 @@ - struct ncp_server *server; - struct inode *dir = dentry->d_parent->d_inode; - struct ncp_entry_info finfo; -- int res, val = 0, len = dentry->d_name.len + 1; -- __u8 __name[len]; -+ int res, val = 0, len; -+ __u8 __name[NCP_MAXPATHLEN + 1]; - - if (!dentry->d_inode || !dir) - goto finished; -@@ -291,14 +291,15 @@ - dentry->d_parent->d_name.name, dentry->d_name.name, - NCP_GET_AGE(dentry)); - -+ len = sizeof(__name); - if (ncp_is_server_root(dir)) { - res = ncp_io2vol(server, __name, &len, dentry->d_name.name, -- len-1, 1); -+ dentry->d_name.len, 1); - if (!res) - res = ncp_lookup_volume(server, __name, &(finfo.i)); - } else { - res = ncp_io2vol(server, __name, &len, dentry->d_name.name, -- len-1, !ncp_preserve_case(dir)); -+ dentry->d_name.len, !ncp_preserve_case(dir)); - if (!res) - res = ncp_obtain_info(server, dir, __name, &(finfo.i)); - } -@@ -548,9 +549,9 @@ - int valid = 0; - int hashed = 0; - ino_t ino = 0; -- __u8 __name[256]; -+ __u8 __name[NCP_MAXPATHLEN + 1]; - -- qname.len = 256; -+ qname.len = sizeof(__name); - if (ncp_vol2io(NCP_SERVER(inode), __name, &qname.len, - entry->i.entryName, entry->i.nameLen, - !ncp_preserve_entry_case(inode, entry->i.NSCreator))) -@@ -705,16 +706,19 @@ - { - struct ncp_server* server = NCP_SBP(sb); - struct nw_info_struct i; -- int result, len = strlen(server->m.mounted_vol) + 1; -- __u8 __name[len]; -+ int result; - - if (ncp_single_volume(server)) { -+ int len; - struct dentry* dent; -+ __u8 __name[NCP_MAXPATHLEN + 1]; - -- result = -ENOENT; -- if (ncp_io2vol(server, __name, &len, server->m.mounted_vol, -- len-1, 1)) -+ len = sizeof(__name); -+ result = ncp_io2vol(server, __name, &len, server->m.mounted_vol, -+ strlen(server->m.mounted_vol), 1); -+ if (result) - goto out; -+ result = -ENOENT; - if (ncp_lookup_volume(server, __name, &i)) { - PPRINTK("ncp_conn_logged_in: %s not found\n", - server->m.mounted_vol); -@@ -745,8 +749,8 @@ - struct ncp_server *server = NCP_SERVER(dir); - struct inode *inode = NULL; - struct ncp_entry_info finfo; -- int error, res, len = dentry->d_name.len + 1; -- __u8 __name[len]; -+ int error, res, len; -+ __u8 __name[NCP_MAXPATHLEN + 1]; - - error = -EIO; - if (!ncp_conn_valid(server)) -@@ -755,14 +759,15 @@ - PPRINTK("ncp_lookup: server lookup for %s/%s\n", - dentry->d_parent->d_name.name, dentry->d_name.name); - -+ len = sizeof(__name); - if (ncp_is_server_root(dir)) { - res = ncp_io2vol(server, __name, &len, dentry->d_name.name, -- len-1, 1); -+ dentry->d_name.len, 1); - if (!res) - res = ncp_lookup_volume(server, __name, &(finfo.i)); - } else { - res = ncp_io2vol(server, __name, &len, dentry->d_name.name, -- len-1, !ncp_preserve_case(dir)); -+ dentry->d_name.len, !ncp_preserve_case(dir)); - if (!res) - res = ncp_obtain_info(server, dir, __name, &(finfo.i)); - } -@@ -825,9 +830,9 @@ - { - struct ncp_server *server = NCP_SERVER(dir); - struct ncp_entry_info finfo; -- int error, result, len = dentry->d_name.len + 1; -+ int error, result, len; - int opmode; -- __u8 __name[len]; -+ __u8 __name[NCP_MAXPATHLEN + 1]; - - PPRINTK("ncp_create_new: creating %s/%s, mode=%x\n", - dentry->d_parent->d_name.name, dentry->d_name.name, mode); -@@ -836,8 +841,9 @@ - goto out; - - ncp_age_dentry(server, dentry); -+ len = sizeof(__name); - error = ncp_io2vol(server, __name, &len, dentry->d_name.name, -- len-1, !ncp_preserve_case(dir)); -+ dentry->d_name.len, !ncp_preserve_case(dir)); - if (error) - goto out; - -@@ -880,8 +886,8 @@ - { - struct ncp_entry_info finfo; - struct ncp_server *server = NCP_SERVER(dir); -- int error, len = dentry->d_name.len + 1; -- __u8 __name[len]; -+ int error, len; -+ __u8 __name[NCP_MAXPATHLEN + 1]; - - DPRINTK("ncp_mkdir: making %s/%s\n", - dentry->d_parent->d_name.name, dentry->d_name.name); -@@ -890,8 +896,9 @@ - goto out; - - ncp_age_dentry(server, dentry); -+ len = sizeof(__name); - error = ncp_io2vol(server, __name, &len, dentry->d_name.name, -- len-1, !ncp_preserve_case(dir)); -+ dentry->d_name.len, !ncp_preserve_case(dir)); - if (error) - goto out; - -@@ -909,8 +916,8 @@ - static int ncp_rmdir(struct inode *dir, struct dentry *dentry) - { - struct ncp_server *server = NCP_SERVER(dir); -- int error, result, len = dentry->d_name.len + 1; -- __u8 __name[len]; -+ int error, result, len; -+ __u8 __name[NCP_MAXPATHLEN + 1]; - - DPRINTK("ncp_rmdir: removing %s/%s\n", - dentry->d_parent->d_name.name, dentry->d_name.name); -@@ -923,8 +930,9 @@ - if (!d_unhashed(dentry)) - goto out; - -+ len = sizeof(__name); - error = ncp_io2vol(server, __name, &len, dentry->d_name.name, -- len-1, !ncp_preserve_case(dir)); -+ dentry->d_name.len, !ncp_preserve_case(dir)); - if (error) - goto out; - -@@ -1022,9 +1030,8 @@ - { - struct ncp_server *server = NCP_SERVER(old_dir); - int error; -- int old_len = old_dentry->d_name.len + 1; -- int new_len = new_dentry->d_name.len + 1; -- __u8 __old_name[old_len], __new_name[new_len]; -+ int old_len, new_len; -+ __u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1]; - - DPRINTK("ncp_rename: %s/%s to %s/%s\n", - old_dentry->d_parent->d_name.name, old_dentry->d_name.name, -@@ -1037,15 +1044,17 @@ - ncp_age_dentry(server, old_dentry); - ncp_age_dentry(server, new_dentry); - -+ old_len = sizeof(__old_name); - error = ncp_io2vol(server, __old_name, &old_len, -- old_dentry->d_name.name, old_len-1, -- !ncp_preserve_case(old_dir)); -+ old_dentry->d_name.name, old_dentry->d_name.len, -+ !ncp_preserve_case(old_dir)); - if (error) - goto out; - -+ new_len = sizeof(__new_name); - error = ncp_io2vol(server, __new_name, &new_len, -- new_dentry->d_name.name, new_len-1, -- !ncp_preserve_case(new_dir)); -+ new_dentry->d_name.name, new_dentry->d_name.len, -+ !ncp_preserve_case(new_dir)); - if (error) - goto out; - - diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0109.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0109.patch deleted file mode 100644 index d02b51c57fc6..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0109.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- linux/fs/isofs/rock.c.orig -+++ linux/fs/isofs/rock.c -@@ -14,6 +14,7 @@ - #include <linux/slab.h> - #include <linux/pagemap.h> - #include <linux/smp_lock.h> -+#include <asm/page.h> - - #include "rock.h" - -@@ -419,7 +420,7 @@ - return 0; - } - --static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr) -+static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit) - { - int slen; - int rootflag; -@@ -431,16 +432,25 @@ - rootflag = 0; - switch (slp->flags & ~1) { - case 0: -+ if (slp->len > plimit - rpnt) -+ return NULL; - memcpy(rpnt, slp->text, slp->len); - rpnt+=slp->len; - break; -+ case 2: -+ if (rpnt >= plimit) -+ return NULL; -+ *rpnt++='.'; -+ break; - case 4: -+ if (2 > plimit - rpnt) -+ return NULL; - *rpnt++='.'; -- /* fallthru */ -- case 2: - *rpnt++='.'; - break; - case 8: -+ if (rpnt >= plimit) -+ return NULL; - rootflag = 1; - *rpnt++='/'; - break; -@@ -457,17 +467,23 @@ - * If there is another SL record, and this component - * record isn't continued, then add a slash. - */ -- if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1)) -+ if ((!rootflag) && (rr->u.SL.flags & 1) && -+ !(oldslp->flags & 1)) { -+ if (rpnt >= plimit) -+ return NULL; - *rpnt++='/'; -+ } - break; - } - - /* - * If this component record isn't continued, then append a '/'. - */ -- if (!rootflag && !(oldslp->flags & 1)) -+ if (!rootflag && !(oldslp->flags & 1)) { -+ if (rpnt >= plimit) -+ return NULL; - *rpnt++='/'; -- -+ } - } - return rpnt; - } -@@ -548,7 +564,10 @@ - CHECK_SP(goto out); - break; - case SIG('S', 'L'): -- rpnt = get_symlink_chunk(rpnt, rr); -+ rpnt = get_symlink_chunk(rpnt, rr, -+ link + (PAGE_SIZE - 1)); -+ if (rpnt == NULL) -+ goto out; - break; - case SIG('C', 'E'): - /* This tells is if there is a continuation record */ - diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0133.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0133.patch deleted file mode 100644 index c756bc328bf2..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0133.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4.22/fs/xfs/xfs_log.c.can-2004-0133 2004-03-23 12:28:11.000000000 -0700 -+++ linux-2.4.22/fs/xfs/xfs_log.c 2004-03-23 12:58:59.000000000 -0700 -@@ -1251,7 +1251,7 @@ - kmem_zalloc(sizeof(xlog_in_core_t), KM_SLEEP); - iclog = *iclogp; - iclog->hic_data = (xlog_in_core_2_t *) -- kmem_alloc(iclogsize, KM_SLEEP); -+ kmem_zalloc(iclogsize, KM_SLEEP); - - iclog->ic_prev = prev_iclog; - prev_iclog = iclog; diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0177.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0177.patch deleted file mode 100644 index da6b7e190685..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0177.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linux-2.4.26-pre3/fs/jbd/journal.c 2004-02-18 05:36:31.000000000 -0800 -+++ linux-2.4.26-pre4/fs/jbd/journal.c 2004-03-16 09:59:36.000000000 -0800 -@@ -671,6 +671,7 @@ - - bh = getblk(journal->j_dev, blocknr, journal->j_blocksize); - lock_buffer(bh); -+ memset(bh->b_data, 0, journal->j_blocksize); - BUFFER_TRACE(bh, "return this buffer"); - return journal_add_journal_head(bh); - } diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0178.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0178.patch deleted file mode 100644 index 19e57268c2fa..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0178.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4.26-pre2/drivers/sound/sb_audio.c 2002-02-25 11:38:06.000000000 -0800 -+++ linux-2.4.26-pre3/drivers/sound/sb_audio.c 2004-03-13 07:43:23.000000000 -0800 -@@ -879,7 +879,7 @@ - c -= locallen; p += locallen; - } - /* used = ( samples * 16 bits size ) */ -- *used = len << 1; -+ *used = max_in > ( max_out << 1) ? (max_out << 1) : max_in; - /* returned = ( samples * 8 bits size ) */ - *returned = len; - } diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0181.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0181.patch deleted file mode 100644 index 3d44c0fd0880..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0181.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- linux-2.4.22/fs/jfs/jfs_logmgr.c.jfs-sec 2004-03-23 12:30:35.000000000 -0700 -+++ linux-2.4.22/fs/jfs/jfs_logmgr.c 2004-03-23 13:01:51.000000000 -0700 -@@ -1693,7 +1693,7 @@ - if (lbuf == 0) - goto error; - lbuf->l_bh.b_data = lbuf->l_ldata = -- (char *) __get_free_page(GFP_KERNEL); -+ (char *) get_zeroed_page(GFP_KERNEL); - if (lbuf->l_ldata == 0) { - kfree(lbuf); - goto error; ---- linux-2.4.20/fs/jfs/jfs_metapage.c 2002-11-28 23:53:15.000000000 +0000 -+++ linux-2.4.20/fs/jfs/jfs_metapage.c.plasmaroo 2004-05-29 13:36:44.575503152 +0100 -@@ -379,6 +379,10 @@ - } - mp->data = kmap(mp->page) + page_offset; - } -+ -+ if(new) -+ memset(mp->data, 0, PSIZE); -+ - jFYI(1, ("__get_metapage: returning = 0x%p\n", mp)); - return mp; - ---- linux-2.4.20/fs/jfs/super.c 2002-11-28 23:53:15.000000000 +0000 -+++ linux-2.4.20/fs/jfs/super.c.plasmaroo 2004-05-29 13:39:36.898306104 +0100 -@@ -373,6 +373,7 @@ - - if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) == - SLAB_CTOR_CONSTRUCTOR) { -+ memset(jfs_ip, 0, sizeof(struct jfs_inode_info)); - INIT_LIST_HEAD(&jfs_ip->anon_inode_list); - INIT_LIST_HEAD(&jfs_ip->mp_list); - init_rwsem(&jfs_ip->rdwrlock); diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0394.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0394.patch deleted file mode 100644 index 273f1a52046f..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0394.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4.22-oM3-orig/kernel/panic.c Tue Mar 30 15:37:18 2004 -+++ linux-2.4.22-oM3-mod/kernel/panic.c Mon May 17 18:44:01 2004 -@@ -51,7 +51,7 @@ - - bust_spinlocks(1); - va_start(args, fmt); -- vsprintf(buf, fmt, args); -+ vsnprintf(buf, sizeof(buf), fmt, args); - va_end(args); - printk(KERN_EMERG "Kernel panic: %s\n",buf); - if (in_interrupt()) diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0427.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0427.patch deleted file mode 100644 index ddc9610f67f8..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0427.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nar -U 4 linux-2.4.25/kernel/fork.c linux-2.4.25-new/kernel/fork.c ---- linux-2.4.25/kernel/fork.c 2004-02-18 05:36:32.000000000 -0800 -+++ linux-2.4.25-new/kernel/fork.c 2004-04-07 17:43:29.000000000 -0700 -@@ -825,8 +825,10 @@ - bad_fork_cleanup_namespace: - exit_namespace(p); - bad_fork_cleanup_mm: - exit_mm(p); -+ if (p->active_mm) -+ mmdrop(p->active_mm); - bad_fork_cleanup_sighand: - exit_sighand(p); - bad_fork_cleanup_fs: - exit_fs(p); /* blocking */ diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0495.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0495.patch deleted file mode 100644 index bea80eac69a9..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0495.patch +++ /dev/null @@ -1,655 +0,0 @@ ---- linux/net/decnet/dn_dev.c.bak Wed Jun 16 14:42:24 2004 -+++ linux/net/decnet/dn_dev.c Wed Jun 16 14:42:34 2004 -@@ -1070,31 +1070,39 @@ int dnet_gifconf(struct net_device *dev, - { - struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr; - struct dn_ifaddr *ifa; -- struct ifreq *ifr = (struct ifreq *)buf; -+ char buffer[DN_IFREQ_SIZE]; -+ struct ifreq *ifr = (struct ifreq *)buffer; -+ struct sockaddr_dn *addr = (struct sockaddr_dn *)&ifr->ifr_addr; - int done = 0; - - if ((dn_db == NULL) || ((ifa = dn_db->ifa_list) == NULL)) - return 0; - - for(; ifa; ifa = ifa->ifa_next) { -- if (!ifr) { -+ if (!buf) { - done += sizeof(DN_IFREQ_SIZE); - continue; - } - if (len < DN_IFREQ_SIZE) - return done; -- memset(ifr, 0, DN_IFREQ_SIZE); -+ memset(buffer, 0, DN_IFREQ_SIZE); - - if (ifa->ifa_label) - strcpy(ifr->ifr_name, ifa->ifa_label); - else - strcpy(ifr->ifr_name, dev->name); - -- (*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_family = AF_DECnet; -- (*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_add.a_len = 2; -- (*(dn_address *)(*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_add.a_addr) = ifa->ifa_local; -+ addr->sdn_family = AF_DECnet; -+ addr->sdn_add.a_len = 2; -+ memcpy(addr->sdn_add.a_addr, &ifa->ifa_local, -+ sizeof(dn_address)); - -- ifr = (struct ifreq *)((char *)ifr + DN_IFREQ_SIZE); -+ if (copy_to_user(buf, buffer, DN_IFREQ_SIZE)) { -+ done = -EFAULT; -+ break; -+ } -+ -+ buf += DN_IFREQ_SIZE; - len -= DN_IFREQ_SIZE; - done += DN_IFREQ_SIZE; - } ---- linux-2.4.21/drivers/net/wireless/airo.c 2003-06-13 15:51:35.000000000 +0100 -+++ linux-2.4.21/drivers/net/wireless/airo.c.plasmaroo 2004-06-24 11:09:08.260352168 +0100 -@@ -3012,19 +3012,22 @@ - size_t len, - loff_t *offset ) - { -- int i; -- int pos; -+ loff_t pos = *offset; - struct proc_data *priv = (struct proc_data*)file->private_data; - -- if( !priv->rbuffer ) return -EINVAL; -+ if (!priv->rbuffer) -+ return -EINVAL; - -- pos = *offset; -- for( i = 0; i+pos < priv->readlen && i < len; i++ ) { -- if (put_user( priv->rbuffer[i+pos], buffer+i )) -- return -EFAULT; -- } -- *offset += i; -- return i; -+ if (pos < 0) -+ return -EINVAL; -+ if (pos >= priv->readlen) -+ return 0; -+ if (len > priv->readlen - pos) -+ len = priv->readlen - pos; -+ if (copy_to_user(buffer, priv->rbuffer + pos, len)) -+ return -EFAULT; -+ *offset = pos + len; -+ return len; - } - - /* -@@ -3036,24 +3039,24 @@ - size_t len, - loff_t *offset ) - { -- int i; -- int pos; -+ loff_t pos = *offset; - struct proc_data *priv = (struct proc_data*)file->private_data; - -- if ( !priv->wbuffer ) { -+ if (!priv->wbuffer) - return -EINVAL; -- } -- -- pos = *offset; - -- for( i = 0; i + pos < priv->maxwritelen && -- i < len; i++ ) { -- if (get_user( priv->wbuffer[i+pos], buffer + i )) -- return -EFAULT; -- } -- if ( i+pos > priv->writelen ) priv->writelen = i+file->f_pos; -- *offset += i; -- return i; -+ if (pos < 0) -+ return -EINVAL; -+ if (pos >= priv->maxwritelen) -+ return 0; -+ if (len > priv->maxwritelen - pos) -+ len = priv->maxwritelen - pos; -+ if (copy_from_user(priv->wbuffer + pos, buffer, len)) -+ return -EFAULT; -+ if (pos + len > priv->writelen) -+ priv->writelen = pos + len; -+ *offset = pos + len; -+ return len; - } - - static int proc_status_open( struct inode *inode, struct file *file ) { ---- linux/drivers/sound/mpu401.c.bak Wed Jun 16 14:42:24 2004 -+++ linux/drivers/sound/mpu401.c Wed Jun 16 14:42:34 2004 -@@ -1493,14 +1493,16 @@ static unsigned long mpu_timer_get_time( - static int mpu_timer_ioctl(int dev, unsigned int command, caddr_t arg) - { - int midi_dev = sound_timer_devs[dev]->devlink; -+ int *p = (int *)arg; - - switch (command) - { - case SNDCTL_TMR_SOURCE: - { - int parm; -- -- parm = *(int *) arg; -+ -+ if (get_user(parm, p)) -+ return -EFAULT; - parm &= timer_caps; - - if (parm != 0) -@@ -1512,7 +1514,9 @@ static int mpu_timer_ioctl(int dev, unsi - else if (timer_mode & TMR_MODE_SMPTE) - mpu_cmd(midi_dev, 0x3d, 0); /* Use SMPTE sync */ - } -- return (*(int *) arg = timer_mode); -+ if (put_user(timer_mode, p)) -+ return -EFAULT; -+ return timer_mode; - } - break; - -@@ -1537,10 +1541,13 @@ static int mpu_timer_ioctl(int dev, unsi - { - int val; - -- val = *(int *) arg; -+ if (get_user(val, p)) -+ return -EFAULT; - if (val) - set_timebase(midi_dev, val); -- return (*(int *) arg = curr_timebase); -+ if (put_user(curr_timebase, p)) -+ return -EFAULT; -+ return curr_timebase; - } - break; - -@@ -1549,7 +1556,8 @@ static int mpu_timer_ioctl(int dev, unsi - int val; - int ret; - -- val = *(int *) arg; -+ if (get_user(val, p)) -+ return -EFAULT; - - if (val) - { -@@ -1564,7 +1572,9 @@ static int mpu_timer_ioctl(int dev, unsi - } - curr_tempo = val; - } -- return (*(int *) arg = curr_tempo); -+ if (put_user(curr_tempo, p)) -+ return -EFAULT; -+ return curr_tempo; - } - break; - -@@ -1572,18 +1582,25 @@ static int mpu_timer_ioctl(int dev, unsi - { - int val; - -- val = *(int *) arg; -+ if (get_user(val, p)) -+ return -EFAULT; - if (val != 0) /* Can't change */ - return -EINVAL; -- return (*(int *) arg = ((curr_tempo * curr_timebase) + 30) / 60); -+ val = (curr_tempo * curr_timebase + 30) / 60; -+ if (put_user(val, p)) -+ return -EFAULT; -+ return val; - } - break; - - case SNDCTL_SEQ_GETTIME: -- return (*(int *) arg = curr_ticks); -+ if (put_user(curr_ticks, p)) -+ return -EFAULT; -+ return curr_ticks; - - case SNDCTL_TMR_METRONOME: -- metronome_mode = *(int *) arg; -+ if (get_user(metronome_mode, p)) -+ return -EFAULT; - setup_metronome(midi_dev); - return 0; - ---- linux/drivers/sound/msnd.c.bak Wed Jun 16 14:42:24 2004 -+++ linux/drivers/sound/msnd.c Wed Jun 16 14:42:34 2004 -@@ -155,13 +155,10 @@ void msnd_fifo_make_empty(msnd_fifo *f) - f->len = f->tail = f->head = 0; - } - --int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len, int user) -+int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len) - { - int count = 0; - -- if (f->len == f->n) -- return 0; -- - while ((count < len) && (f->len != f->n)) { - - int nwritten; -@@ -177,11 +174,7 @@ int msnd_fifo_write(msnd_fifo *f, const - nwritten = len - count; - } - -- if (user) { -- if (copy_from_user(f->data + f->tail, buf, nwritten)) -- return -EFAULT; -- } else -- isa_memcpy_fromio(f->data + f->tail, (unsigned long) buf, nwritten); -+ isa_memcpy_fromio(f->data + f->tail, (unsigned long) buf, nwritten); - - count += nwritten; - buf += nwritten; -@@ -193,13 +186,10 @@ int msnd_fifo_write(msnd_fifo *f, const - return count; - } - --int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len, int user) -+int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len) - { - int count = 0; - -- if (f->len == 0) -- return f->len; -- - while ((count < len) && (f->len > 0)) { - - int nread; -@@ -215,11 +205,7 @@ int msnd_fifo_read(msnd_fifo *f, char *b - nread = len - count; - } - -- if (user) { -- if (copy_to_user(buf, f->data + f->head, nread)) -- return -EFAULT; -- } else -- isa_memcpy_toio((unsigned long) buf, f->data + f->head, nread); -+ isa_memcpy_toio((unsigned long) buf, f->data + f->head, nread); - - count += nread; - buf += nread; ---- linux/drivers/sound/msnd.h.bak Wed Jun 16 14:42:24 2004 -+++ linux/drivers/sound/msnd.h Wed Jun 16 14:42:34 2004 -@@ -266,8 +266,8 @@ void msnd_fifo_init(msnd_fifo *f); - void msnd_fifo_free(msnd_fifo *f); - int msnd_fifo_alloc(msnd_fifo *f, size_t n); - void msnd_fifo_make_empty(msnd_fifo *f); --int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len, int user); --int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len, int user); -+int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len); -+int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len); - - int msnd_wait_TXDE(multisound_dev_t *dev); - int msnd_wait_HC0(multisound_dev_t *dev); ---- linux/drivers/sound/msnd_pinnacle.c.bak Wed Jun 16 14:42:24 2004 -+++ linux/drivers/sound/msnd_pinnacle.c Wed Jun 16 14:42:34 2004 -@@ -804,7 +804,7 @@ static int dev_release(struct inode *ino - - static __inline__ int pack_DARQ_to_DARF(register int bank) - { -- register int size, n, timeout = 3; -+ register int size, timeout = 3; - register WORD wTmp; - LPDAQD DAQD; - -@@ -825,13 +825,10 @@ static __inline__ int pack_DARQ_to_DARF( - /* Read data from the head (unprotected bank 1 access okay - since this is only called inside an interrupt) */ - outb(HPBLKSEL_1, dev.io + HP_BLKS); -- if ((n = msnd_fifo_write( -+ msnd_fifo_write( - &dev.DARF, - (char *)(dev.base + bank * DAR_BUFF_SIZE), -- size, 0)) <= 0) { -- outb(HPBLKSEL_0, dev.io + HP_BLKS); -- return n; -- } -+ size); - outb(HPBLKSEL_0, dev.io + HP_BLKS); - - return 1; -@@ -853,21 +850,16 @@ static __inline__ int pack_DAPF_to_DAPQ( - if (protect) { - /* Critical section: protect fifo in non-interrupt */ - spin_lock_irqsave(&dev.lock, flags); -- if ((n = msnd_fifo_read( -+ n = msnd_fifo_read( - &dev.DAPF, - (char *)(dev.base + bank_num * DAP_BUFF_SIZE), -- DAP_BUFF_SIZE, 0)) < 0) { -- spin_unlock_irqrestore(&dev.lock, flags); -- return n; -- } -+ DAP_BUFF_SIZE); - spin_unlock_irqrestore(&dev.lock, flags); - } else { -- if ((n = msnd_fifo_read( -+ n = msnd_fifo_read( - &dev.DAPF, - (char *)(dev.base + bank_num * DAP_BUFF_SIZE), -- DAP_BUFF_SIZE, 0)) < 0) { -- return n; -- } -+ DAP_BUFF_SIZE); - } - if (!n) - break; -@@ -894,30 +886,43 @@ static __inline__ int pack_DAPF_to_DAPQ( - static int dsp_read(char *buf, size_t len) - { - int count = len; -+ char *page = (char *)__get_free_page(PAGE_SIZE); -+ -+ if (!page) -+ return -ENOMEM; - - while (count > 0) { -- int n; -+ int n, k; - unsigned long flags; - -+ k = PAGE_SIZE; -+ if (k > count) -+ k = count; -+ - /* Critical section: protect fifo in non-interrupt */ - spin_lock_irqsave(&dev.lock, flags); -- if ((n = msnd_fifo_read(&dev.DARF, buf, count, 1)) < 0) { -- printk(KERN_WARNING LOGNAME ": FIFO read error\n"); -- spin_unlock_irqrestore(&dev.lock, flags); -- return n; -- } -+ n = msnd_fifo_read(&dev.DARF, page, k); - spin_unlock_irqrestore(&dev.lock, flags); -+ if (copy_to_user(buf, page, n)) { -+ free_page((unsigned long)page); -+ return -EFAULT; -+ } - buf += n; - count -= n; - -+ if (n == k && count) -+ continue; -+ - if (!test_bit(F_READING, &dev.flags) && dev.mode & FMODE_READ) { - dev.last_recbank = -1; - if (chk_send_dsp_cmd(&dev, HDEX_RECORD_START) == 0) - set_bit(F_READING, &dev.flags); - } - -- if (dev.rec_ndelay) -+ if (dev.rec_ndelay) { -+ free_page((unsigned long)page); - return count == len ? -EAGAIN : len - count; -+ } - - if (count > 0) { - set_bit(F_READBLOCK, &dev.flags); -@@ -926,41 +931,57 @@ static int dsp_read(char *buf, size_t le - get_rec_delay_jiffies(DAR_BUFF_SIZE))) - clear_bit(F_READING, &dev.flags); - clear_bit(F_READBLOCK, &dev.flags); -- if (signal_pending(current)) -+ if (signal_pending(current)) { -+ free_page((unsigned long)page); - return -EINTR; -+ } - } - } -- -+ free_page((unsigned long)page); - return len - count; - } - - static int dsp_write(const char *buf, size_t len) - { - int count = len; -+ char *page = (char *)__get_free_page(GFP_KERNEL); -+ -+ if (!page) -+ return -ENOMEM; - - while (count > 0) { -- int n; -+ int n, k; - unsigned long flags; - -+ k = PAGE_SIZE; -+ if (k > count) -+ k = count; -+ -+ if (copy_from_user(page, buf, k)) { -+ free_page((unsigned long)page); -+ return -EFAULT; -+ } -+ - /* Critical section: protect fifo in non-interrupt */ - spin_lock_irqsave(&dev.lock, flags); -- if ((n = msnd_fifo_write(&dev.DAPF, buf, count, 1)) < 0) { -- printk(KERN_WARNING LOGNAME ": FIFO write error\n"); -- spin_unlock_irqrestore(&dev.lock, flags); -- return n; -- } -+ n = msnd_fifo_write(&dev.DAPF, page, k); - spin_unlock_irqrestore(&dev.lock, flags); - buf += n; - count -= n; - -+ if (count && n == k) -+ continue; -+ - if (!test_bit(F_WRITING, &dev.flags) && (dev.mode & FMODE_WRITE)) { - dev.last_playbank = -1; - if (pack_DAPF_to_DAPQ(1) > 0) - set_bit(F_WRITING, &dev.flags); - } - -- if (dev.play_ndelay) -+ if (dev.play_ndelay) { -+ free_page((unsigned long)page); - return count == len ? -EAGAIN : len - count; -+ } - - if (count > 0) { - set_bit(F_WRITEBLOCK, &dev.flags); -@@ -968,11 +989,14 @@ static int dsp_write(const char *buf, si - &dev.writeblock, - get_play_delay_jiffies(DAP_BUFF_SIZE)); - clear_bit(F_WRITEBLOCK, &dev.flags); -- if (signal_pending(current)) -+ if (signal_pending(current)) { -+ free_page((unsigned long)page); - return -EINTR; -+ } - } - } - -+ free_page((unsigned long)page); - return len - count; - } - ---- linux/drivers/sound/pss.c.bak Wed Jun 16 14:42:24 2004 -+++ linux/drivers/sound/pss.c Wed Jun 16 14:42:34 2004 -@@ -450,20 +450,36 @@ static void pss_mixer_reset(pss_confdata - } - } - --static void arg_to_volume_mono(unsigned int volume, int *aleft) -+static int set_volume_mono(caddr_t p, int *aleft) - { - int left; -+ unsigned volume; -+ if (get_user(volume, (unsigned *)p)) -+ return -EFAULT; - -- left = volume & 0x00ff; -+ left = volume & 0xff; - if (left > 100) - left = 100; - *aleft = left; -+ return 0; - } - --static void arg_to_volume_stereo(unsigned int volume, int *aleft, int *aright) -+static int set_volume_stereo(caddr_t p, int *aleft, int *aright) - { -- arg_to_volume_mono(volume, aleft); -- arg_to_volume_mono(volume >> 8, aright); -+ int left, right; -+ unsigned volume; -+ if (get_user(volume, (unsigned *)p)) -+ return -EFAULT; -+ -+ left = volume & 0xff; -+ if (left > 100) -+ left = 100; -+ right = (volume >> 8) & 0xff; -+ if (right > 100) -+ right = 100; -+ *aleft = left; -+ *aright = right; -+ return 0; - } - - static int ret_vol_mono(int left) -@@ -510,33 +526,38 @@ static int pss_mixer_ioctl (int dev, uns - return call_ad_mixer(devc, cmd, arg); - else - { -- if (*(int *)arg != 0) -+ int v; -+ if (get_user(v, (int *)arg)) -+ return -EFAULT; -+ if (v != 0) - return -EINVAL; - return 0; - } - case SOUND_MIXER_VOLUME: -- arg_to_volume_stereo(*(unsigned int *)arg, &devc->mixer.volume_l, -- &devc->mixer.volume_r); -+ if (set_volume_stereo(arg, -+ &devc->mixer.volume_l, -+ &devc->mixer.volume_r)) -+ return -EFAULT; - set_master_volume(devc, devc->mixer.volume_l, - devc->mixer.volume_r); - return ret_vol_stereo(devc->mixer.volume_l, - devc->mixer.volume_r); - - case SOUND_MIXER_BASS: -- arg_to_volume_mono(*(unsigned int *)arg, -- &devc->mixer.bass); -+ if (set_volume_mono(arg, &devc->mixer.bass)) -+ return -EFAULT; - set_bass(devc, devc->mixer.bass); - return ret_vol_mono(devc->mixer.bass); - - case SOUND_MIXER_TREBLE: -- arg_to_volume_mono(*(unsigned int *)arg, -- &devc->mixer.treble); -+ if (set_volume_mono(arg, &devc->mixer.treble)) -+ return -EFAULT; - set_treble(devc, devc->mixer.treble); - return ret_vol_mono(devc->mixer.treble); - - case SOUND_MIXER_SYNTH: -- arg_to_volume_mono(*(unsigned int *)arg, -- &devc->mixer.synth); -+ if (set_volume_mono(arg, &devc->mixer.synth)) -+ return -EFAULT; - set_synth_volume(devc, devc->mixer.synth); - return ret_vol_mono(devc->mixer.synth); - -@@ -546,54 +567,67 @@ static int pss_mixer_ioctl (int dev, uns - } - else - { -+ int val, and_mask = 0, or_mask = 0; - /* - * Return parameters - */ - switch (cmdf) - { -- - case SOUND_MIXER_DEVMASK: - if (call_ad_mixer(devc, cmd, arg) == -EINVAL) -- *(int *)arg = 0; /* no mixer devices */ -- return (*(int *)arg |= SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_SYNTH); -+ break; -+ and_mask = ~0; -+ or_mask = SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_SYNTH; -+ break; - - case SOUND_MIXER_STEREODEVS: - if (call_ad_mixer(devc, cmd, arg) == -EINVAL) -- *(int *)arg = 0; /* no stereo devices */ -- return (*(int *)arg |= SOUND_MASK_VOLUME); -+ break; -+ and_mask = ~0; -+ or_mask = SOUND_MASK_VOLUME; -+ break; - - case SOUND_MIXER_RECMASK: - if (devc->ad_mixer_dev != NO_WSS_MIXER) - return call_ad_mixer(devc, cmd, arg); -- else -- return (*(int *)arg = 0); /* no record devices */ -+ break; - - case SOUND_MIXER_CAPS: - if (devc->ad_mixer_dev != NO_WSS_MIXER) - return call_ad_mixer(devc, cmd, arg); -- else -- return (*(int *)arg = SOUND_CAP_EXCL_INPUT); -+ or_mask = SOUND_CAP_EXCL_INPUT; -+ break; - - case SOUND_MIXER_RECSRC: - if (devc->ad_mixer_dev != NO_WSS_MIXER) - return call_ad_mixer(devc, cmd, arg); -- else -- return (*(int *)arg = 0); /* no record source */ -+ break; - - case SOUND_MIXER_VOLUME: -- return (*(int *)arg = ret_vol_stereo(devc->mixer.volume_l, devc->mixer.volume_r)); -+ or_mask = ret_vol_stereo(devc->mixer.volume_l, devc->mixer.volume_r); -+ break; - - case SOUND_MIXER_BASS: -- return (*(int *)arg = ret_vol_mono(devc->mixer.bass)); -+ or_mask = ret_vol_mono(devc->mixer.bass); -+ break; - - case SOUND_MIXER_TREBLE: -- return (*(int *)arg = ret_vol_mono(devc->mixer.treble)); -+ or_mask = ret_vol_mono(devc->mixer.treble); -+ break; - - case SOUND_MIXER_SYNTH: -- return (*(int *)arg = ret_vol_mono(devc->mixer.synth)); -+ or_mask = ret_vol_mono(devc->mixer.synth); -+ break; - default: - return -EINVAL; - } -+ if (get_user(val, (int *)arg)) -+ return -EFAULT; -+ val &= and_mask; -+ val |= or_mask; -+ if (put_user(val, (int *)arg)) -+ return -EFAULT; -+ return val; - } - } - diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0535.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0535.patch deleted file mode 100644 index 669fc5fd32fb..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0535.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- drivers/net/e1000/e1000_ethtool.c 2003-06-13 15:51:34.000000000 +0100 -+++ drivers/net/e1000/e1000_ethtool.c.plasmaroo 2004-06-24 11:23:32.524963976 +0100 -@@ -468,6 +468,9 @@ - - if(copy_from_user(®s, addr, sizeof(regs))) - return -EFAULT; -+ memset(regs_buff, 0, sizeof(regs_buff)); -+ if (regs.len > E1000_REGS_LEN) -+ regs.len = E1000_REGS_LEN; - e1000_ethtool_gregs(adapter, ®s, regs_buff); - if(copy_to_user(addr, ®s, sizeof(regs))) - return -EFAULT; diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.FPULockup-53804.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.FPULockup-53804.patch deleted file mode 100644 index 1dd5ed87b520..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.FPULockup-53804.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4/include/asm-i386/i387.h 2004-06-13 20:06:05.044881328 +0100 -+++ linux-2.4/include/asm-i386/i387.h 2004-06-13 20:25:42.836829736 +0100 -@@ -34,7 +34,7 @@ - - #define clear_fpu( tsk ) do { \ - if ( tsk->flags & PF_USEDFPU ) { \ -- asm volatile("fwait"); \ -+ asm volatile("fnclex ; fwait"); \ - tsk->flags &= ~PF_USEDFPU; \ - stts(); \ - } \ diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.I2C_Limits.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.I2C_Limits.patch deleted file mode 100644 index af20a6fc0c2c..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.I2C_Limits.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- linux-2.4.20/drivers/i2c/i2c-dev.c 2004-06-19 03:27:30 -07:00 -+++ linux-2.4.21/drivers/i2c/i2c-dev.c 2004-06-19 03:27:30 -07:00 -@@ -254,6 +254,11 @@ - sizeof(rdwr_arg))) - return -EFAULT; - -+ /* Put an arbritrary limit on the number of messages that can -+ * be sent at once */ -+ if (rdwr_arg.nmsgs > 42) -+ return -EINVAL; -+ - rdwr_pa = (struct i2c_msg *) - kmalloc(rdwr_arg.nmsgs * sizeof(struct i2c_msg), - GFP_KERNEL); -@@ -270,6 +275,11 @@ - res = -EFAULT; - break; - } -+ /* Limit the size of the message to a sane amount */ -+ if (rdwr_pa[i].len > 8192) { -+ res = -EINVAL; -+ break; -+ } - rdwr_pa[i].buf = kmalloc(rdwr_pa[i].len, GFP_KERNEL); - if(rdwr_pa[i].buf == NULL) - { -@@ -280,10 +290,16 @@ - rdwr_arg.msgs[i].buf, - rdwr_pa[i].len)) - { -- kfree(rdwr_pa[i].buf); - res = -EFAULT; - break; - } -+ } -+ if (res < 0) { -+ int j; -+ for (j = 0; j < i; ++j) -+ kfree(rdwr_pa[j].buf); -+ kfree(rdwr_pa); -+ return res; - } - if (!res) - { diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.munmap.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.munmap.patch deleted file mode 100644 index e120b35b7adb..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.munmap.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur linux-2.4.25-rc3/mm/mremap.c linux-2.4.25-rc4/mm/mremap.c ---- linux-2.4.25-rc3/mm/mremap.c 2004-02-18 13:56:01.000000000 +0000 -+++ linux-2.4.25-rc4/mm/mremap.c 2004-02-18 13:49:08.000000000 +0000 -@@ -258,16 +258,20 @@ - if ((addr <= new_addr) && (addr+old_len) > new_addr) - goto out; - -- do_munmap(current->mm, new_addr, new_len); -+ ret = do_munmap(current->mm, new_addr, new_len); -+ if (ret && new_len) -+ goto out; - } - - /* - * Always allow a shrinking remap: that just unmaps - * the unnecessary pages.. - */ -- ret = addr; - if (old_len >= new_len) { -- do_munmap(current->mm, addr+new_len, old_len - new_len); -+ ret = do_munmap(current->mm, addr+new_len, old_len - new_len); -+ if (ret && old_len != new_len) -+ goto out; -+ ret = addr; - if (!(flags & MREMAP_FIXED) || (new_addr == addr)) - goto out; - } diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.rtc_fix.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.rtc_fix.patch deleted file mode 100644 index 00937f83623f..000000000000 --- a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.rtc_fix.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -ur linux-2.4.20-wolk4.9s/arch/cris/drivers/ds1302.c linux-2.4.20-wolk4.9s.plasmaroo/arch/cris/drivers/ds1302.c ---- linux-2.4.20-wolk4.9s/arch/cris/drivers/ds1302.c 2004-01-05 23:33:45.000000000 +0000 -+++ linux-2.4.20-wolk4.9s.plasmaroo/arch/cris/drivers/ds1302.c 2004-01-05 23:41:44.000000000 +0000 -@@ -315,6 +315,7 @@ - { - struct rtc_time rtc_tm; - -+ memset(&rtc_tm, 0, sizeof (struct rtc_time)); - get_rtc_time(&rtc_tm); - if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time))) - return -EFAULT; -diff -ur linux-2.4.20-wolk4.9s/arch/m68k/bvme6000/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/bvme6000/rtc.c ---- linux-2.4.20-wolk4.9s/arch/m68k/bvme6000/rtc.c 2004-01-05 23:33:45.000000000 +0000 -+++ linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/bvme6000/rtc.c 2004-01-05 23:43:15.000000000 +0000 -@@ -54,6 +54,7 @@ - /* Ensure clock and real-time-mode-register are accessible */ - msr = rtc->msr & 0xc0; - rtc->msr = 0x40; -+ memset(&wtime, 0, sizeof (struct rtc_time)); - do { - wtime.tm_sec = BCD2BIN(rtc->bcd_sec); - wtime.tm_min = BCD2BIN(rtc->bcd_min); -diff -ur linux-2.4.20-wolk4.9s/arch/m68k/mvme16x/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/mvme16x/rtc.c ---- linux-2.4.20-wolk4.9s/arch/m68k/mvme16x/rtc.c 2004-01-05 23:33:45.000000000 +0000 -+++ linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/mvme16x/rtc.c 2004-01-05 23:44:02.000000000 +0000 -@@ -52,6 +52,7 @@ - cli(); - /* Ensure clock and real-time-mode-register are accessible */ - rtc->ctrl = RTC_READ; -+ memset(&wtime, 0, sizeof (struct rtc_time)); - wtime.tm_sec = BCD2BIN(rtc->bcd_sec); - wtime.tm_min = BCD2BIN(rtc->bcd_min); - wtime.tm_hour = BCD2BIN(rtc->bcd_hr); -diff -ur linux-2.4.20-wolk4.9s/arch/ppc64/kernel/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/arch/ppc64/kernel/rtc.c ---- linux-2.4.20-wolk4.9s/arch/ppc64/kernel/rtc.c 2004-01-05 23:33:45.000000000 +0000 -+++ linux-2.4.20-wolk4.9s.plasmaroo/arch/ppc64/kernel/rtc.c 2004-01-05 23:44:34.000000000 +0000 -@@ -96,6 +96,7 @@ - switch (cmd) { - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - ppc_md.get_rtc_time(&wtime); - break; - } -diff -ur linux-2.4.20-wolk4.9s/drivers/char/efirtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/efirtc.c ---- linux-2.4.20-wolk4.9s/drivers/char/efirtc.c 2004-01-05 23:33:45.000000000 +0000 -+++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/efirtc.c 2004-01-05 23:47:53.000000000 +0000 -@@ -118,6 +118,7 @@ - static void - convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime) - { -+ memset(wtime, 0, sizeof(struct rtc_time)); - wtime->tm_sec = eft->second; - wtime->tm_min = eft->minute; - wtime->tm_hour = eft->hour; -diff -ur linux-2.4.20-wolk4.9s/drivers/char/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/rtc.c ---- linux-2.4.20-wolk4.9s/drivers/char/rtc.c 2004-01-05 23:33:45.000000000 +0000 -+++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/rtc.c 2004-01-05 23:52:43.000000000 +0000 -@@ -370,6 +370,7 @@ - * tm_min, and tm_sec values are filled in. - */ - -+ memset(&wtime, 0, sizeof(struct rtc_time)); - get_rtc_alm_time(&wtime); - break; - } -@@ -417,6 +418,7 @@ - } - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - get_rtc_time(&wtime); - break; - } -diff -ur linux-2.4.20-wolk4.9s/drivers/macintosh/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/macintosh/rtc.c ---- linux-2.4.20-wolk4.9s/drivers/macintosh/rtc.c 2004-01-05 23:33:45.000000000 +0000 -+++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/macintosh/rtc.c 2004-01-05 23:54:15.000000000 +0000 -@@ -64,6 +64,7 @@ - case RTC_RD_TIME: - if (ppc_md.get_rtc_time) - { -+ memset(&rtc_tm, 0, sizeof(struct rtc_time)); - get_rtc_time(&rtc_tm); - - if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time))) -diff -ur linux-2.4.20-wolk4.9s/drivers/sbus/char/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/sbus/char/rtc.c ---- linux-2.4.20-wolk4.9s/drivers/sbus/char/rtc.c 2004-01-05 23:33:45.000000000 +0000 -+++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/sbus/char/rtc.c 2004-01-05 23:54:43.000000000 +0000 -@@ -89,6 +89,7 @@ - switch (cmd) - { - case RTCGET: -+ memset(&rtc_tm, 0, sizeof(struct rtc_time)); - get_rtc_time(&rtc_tm); - - if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time))) -diff -ur linux-2.4.20-wolk4.9s/drivers/sgi/char/ds1286.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/sgi/char/ds1286.c ---- linux-2.4.20-wolk4.9s/drivers/sgi/char/ds1286.c 2004-01-05 23:33:45.000000000 +0000 -+++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/sgi/char/ds1286.c 2004-01-05 23:47:25.000000000 +0000 -@@ -174,6 +174,7 @@ - * tm_min, and tm_sec values are filled in. - */ - -+ memset(&wtime, 0, sizeof(struct rtc_time)); - ds1286_get_alm_time(&wtime); - break; - } -@@ -216,6 +217,7 @@ - } - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - ds1286_get_time(&wtime); - break; - } diff --git a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r14.ebuild b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r14.ebuild deleted file mode 100644 index 5c2187041308..000000000000 --- a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r14.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/gaming-sources-2.4.20-r14.ebuild,v 1.3 2004/07/04 16:37:55 vapier Exp $ - -IUSE="build" - -# OKV=original kernel version, KV=patched kernel version. - -ETYPE="sources" -inherit kernel eutils - -OKV="2.4.20" -EXTRAVERSION="-gaming-${PR}" -KV="${OKV}${EXTRAVERSION}" -S=${WORKDIR}/linux-${KV} -CKV="2.4.20-ck7" - -DESCRIPTION="Full sources for the Gentoo gaming-optimized kernel" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://gentoo/patches-${KV/14/5}.tar.bz2 http://www.plumlocosoft.com/kernel/patches/2.4/${OKV}/linux-${CKV}.patch.bz2" - -KEYWORDS="x86 -ppc" -SLOT="${KV}" - -src_unpack() { - unpack linux-${OKV}.tar.bz2 patches-${KV/14/5}.tar.bz2 - bzcat ${DISTDIR}/linux-${CKV}.patch.bz2 | patch -p0 || die "-ck patch failed" - - mv linux-${OKV} linux-${KV} || die - - cd ${KV/14/5} || die - rm 98_nforce2_agp.patch # In -ck7 - kernel_src_unpack - - epatch ${FILESDIR}/${P}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" - epatch ${FILESDIR}/${P}.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!" - epatch ${FILESDIR}/${P}.CAN-2004-0010.patch || die "Failed to add the CAN-2004-0010 patch!" - epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to add the CAN-2004-0109 patch!" - epatch ${FILESDIR}/${P}.CAN-2004-0133.patch || die "Failed to add the CAN-2004-0075 patch!" - epatch ${FILESDIR}/${P}.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!" - epatch ${FILESDIR}/${P}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!" - epatch ${FILESDIR}/${P}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0075 patch!" - epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0075 patch!" - epatch ${FILESDIR}/${P}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0075 patch!" - epatch ${FILESDIR}/${P}.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!" - epatch ${FILESDIR}/${P}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!" - - epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!" - epatch ${FILESDIR}/${P}.I2C_Limits.patch || die "Failed to patch the I2C i2cdev_ioctl() kmalloc() bug!" - epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!" - epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap patch!" - epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!" -} diff --git a/sys-kernel/gaming-sources/metadata.xml b/sys-kernel/gaming-sources/metadata.xml deleted file mode 100644 index 0a79a3da756e..000000000000 --- a/sys-kernel/gaming-sources/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>kernel</herd> -<maintainer> - <email>plasmaroo@gentoo.org</email> -</maintainer> -<maintainer> - <email>x86-kernel@gentoo.org</email> -</maintainer> -</pkgmetadata> |