diff options
author | Brandon Hale <tseng@gentoo.org> | 2004-07-05 00:01:33 +0000 |
---|---|---|
committer | Brandon Hale <tseng@gentoo.org> | 2004-07-05 00:01:33 +0000 |
commit | 395e6fb6d52262afd36dd61cff5e8a5e304a6fed (patch) | |
tree | 7b7da701320bae26b5de39e6e38643b56ffe7b98 /sys-kernel | |
parent | Updated the kernel-2 eclass to build & install manual pages when 'doc' USE fl... (diff) | |
download | historical-395e6fb6d52262afd36dd61cff5e8a5e304a6fed.tar.gz historical-395e6fb6d52262afd36dd61cff5e8a5e304a6fed.tar.bz2 historical-395e6fb6d52262afd36dd61cff5e8a5e304a6fed.zip |
Remove no longer needed security fix.
Diffstat (limited to 'sys-kernel')
3 files changed, 6 insertions, 91 deletions
diff --git a/sys-kernel/hardened-dev-sources/ChangeLog b/sys-kernel/hardened-dev-sources/ChangeLog index 5e27216133d5..a64d132b9d71 100644 --- a/sys-kernel/hardened-dev-sources/ChangeLog +++ b/sys-kernel/hardened-dev-sources/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-kernel/hardened-dev-sources # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/ChangeLog,v 1.26 2004/07/04 23:59:49 tseng Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/ChangeLog,v 1.27 2004/07/05 00:01:33 tseng Exp $ + + 04 Jul 2004; Brandon Hale <tseng@gentoo.org> + -files/hardened-dev-sources-2.6.5.CAN-2004-0109.patch: + Remove no longer needed security fix. 04 Jul 2004; Brandon Hale <tseng@gentoo.org> metadata.xml: Remove stray digest, add kernel herd to metadata diff --git a/sys-kernel/hardened-dev-sources/Manifest b/sys-kernel/hardened-dev-sources/Manifest index 58d9723fabd1..b2d736ecf511 100644 --- a/sys-kernel/hardened-dev-sources/Manifest +++ b/sys-kernel/hardened-dev-sources/Manifest @@ -1,5 +1,5 @@ MD5 1c165d5bd7931e3fea5b2d807c7ab1a0 hardened-dev-sources-2.6.5-r5.ebuild 1024 -MD5 72ac080957049ca8fba762b46868d782 ChangeLog 4444 +MD5 0d9cd41579d528729b10198ba60e71a1 ChangeLog 4589 MD5 d33b1d0c8a793a7ae43ddce005a8bdce hardened-dev-sources-2.6.7-r2.ebuild 1091 MD5 a1d72a54847dda12d92b5931049350fc hardened-dev-sources-2.6.7-r1.ebuild 1091 MD5 1d8e512be1a377d00f7c106f7ce29cd1 hardened-dev-sources-2.6.7.ebuild 1088 @@ -8,4 +8,3 @@ MD5 66d5063a0b920237d9a5e19755080970 files/digest-hardened-dev-sources-2.6.7 219 MD5 c811d0dd14e749265a965a2eac4d3629 files/digest-hardened-dev-sources-2.6.5-r5 220 MD5 c62f36f3cf377415226f1ffbe716be4e files/digest-hardened-dev-sources-2.6.7-r2 219 MD5 0db04ba77df8109b2ebd969db220f460 files/digest-hardened-dev-sources-2.6.7-r1 219 -MD5 31ec7b4310dd7be3e34aab0204f9b1e8 files/hardened-dev-sources-2.6.5.CAN-2004-0109.patch 2072 diff --git a/sys-kernel/hardened-dev-sources/files/hardened-dev-sources-2.6.5.CAN-2004-0109.patch b/sys-kernel/hardened-dev-sources/files/hardened-dev-sources-2.6.5.CAN-2004-0109.patch deleted file mode 100644 index d7726c2e5aaf..000000000000 --- a/sys-kernel/hardened-dev-sources/files/hardened-dev-sources-2.6.5.CAN-2004-0109.patch +++ /dev/null @@ -1,88 +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 <linux/buffer_head.h> -+#include <asm/page.h> - - #include "rock.h" -@@ -419,7 +420,7 @@ int parse_rock_ridge_inode_internal(stru - 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 @@ static char *get_symlink_chunk(char *rpn - 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 @@ static char *get_symlink_chunk(char *rpn - * 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 @@ static int rock_ridge_symlink_readpage(s - 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 */ - - |