diff -Naurp --exclude-from=/home/con/kernel/dontdiff linux-2.6.11-ck7/Documentation/SecurityBugs linux-2.6.11-ck8/Documentation/SecurityBugs --- linux-2.6.11-ck7/Documentation/SecurityBugs 1970-01-01 10:00:00.000000000 +1000 +++ linux-2.6.11-ck8/Documentation/SecurityBugs 2005-05-14 18:08:02.000000000 +1000 @@ -0,0 +1,38 @@ +Linux kernel developers take security very seriously. As such, we'd +like to know when a security bug is found so that it can be fixed and +disclosed as quickly as possible. Please report security bugs to the +Linux kernel security team. + +1) Contact + +The Linux kernel security team can be contacted by email at +. This is a private list of security officers +who will help verify the bug report and develop and release a fix. +It is possible that the security team will bring in extra help from +area maintainers to understand and fix the security vulnerability. + +As it is with any bug, the more information provided the easier it +will be to diagnose and fix. Please review the procedure outlined in +REPORTING-BUGS if you are unclear about what information is helpful. +Any exploit code is very helpful and will not be released without +consent from the reporter unless it has already been made public. + +2) Disclosure + +The goal of the Linux kernel security team is to work with the +bug submitter to bug resolution as well as disclosure. We prefer +to fully disclose the bug as soon as possible. It is reasonable to +delay disclosure when the bug or the fix is not yet fully understood, +the solution is not well-tested or for vendor coordination. However, we +expect these delays to be short, measurable in days, not weeks or months. +A disclosure date is negotiated by the security team working with the +bug submitter as well as vendors. However, the kernel security team +holds the final say when setting a disclosure date. The timeframe for +disclosure is from immediate (esp. if it's already publically known) +to a few weeks. As a basic default policy, we expect report date to +disclosure date to be on the order of 7 days. + +3) Non-disclosure agreements + +The Linux kernel security team is not a formal body and therefore unable +to enter any non-disclosure agreements. diff -Naurp --exclude-from=/home/con/kernel/dontdiff linux-2.6.11-ck7/fs/binfmt_elf.c linux-2.6.11-ck8/fs/binfmt_elf.c --- linux-2.6.11-ck7/fs/binfmt_elf.c 2005-05-01 10:49:01.000000000 +1000 +++ linux-2.6.11-ck8/fs/binfmt_elf.c 2005-05-14 18:08:02.000000000 +1000 @@ -257,7 +257,7 @@ create_elf_tables(struct linux_binprm *b } /* Populate argv and envp */ - p = current->mm->arg_start; + p = current->mm->arg_end = current->mm->arg_start; while (argc-- > 0) { size_t len; __put_user((elf_addr_t)p, argv++); @@ -1279,7 +1279,7 @@ static void fill_prstatus(struct elf_prs static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p, struct mm_struct *mm) { - int i, len; + unsigned int i, len; /* first copy the parameters from user space */ memset(psinfo, 0, sizeof(struct elf_prpsinfo)); diff -Naurp --exclude-from=/home/con/kernel/dontdiff linux-2.6.11-ck7/fs/partitions/msdos.c linux-2.6.11-ck8/fs/partitions/msdos.c --- linux-2.6.11-ck7/fs/partitions/msdos.c 2005-05-01 10:49:01.000000000 +1000 +++ linux-2.6.11-ck8/fs/partitions/msdos.c 2004-12-25 10:14:50.000000000 +1100 @@ -114,9 +114,6 @@ parse_extended(struct parsed_partitions */ for (i=0; i<4; i++, p++) { u32 offs, size, next; - - if (SYS_IND(p) == 0) - continue; if (!NR_SECTS(p) || is_extended_partition(p)) continue; @@ -433,8 +430,6 @@ int msdos_partition(struct parsed_partit for (slot = 1 ; slot <= 4 ; slot++, p++) { u32 start = START_SECT(p)*sector_size; u32 size = NR_SECTS(p)*sector_size; - if (SYS_IND(p) == 0) - continue; if (!size) continue; if (is_extended_partition(p)) { diff -Naurp --exclude-from=/home/con/kernel/dontdiff linux-2.6.11-ck7/kernel/exit.c linux-2.6.11-ck8/kernel/exit.c --- linux-2.6.11-ck7/kernel/exit.c 2005-05-01 10:49:01.000000000 +1000 +++ linux-2.6.11-ck8/kernel/exit.c 2005-05-14 18:08:03.000000000 +1000 @@ -515,8 +515,6 @@ static inline void choose_new_parent(tas */ BUG_ON(p == reaper || reaper->exit_state >= EXIT_ZOMBIE); p->real_parent = reaper; - if (p->parent == p->real_parent) - BUG(); } static inline void reparent_thread(task_t *p, task_t *father, int traced) diff -Naurp --exclude-from=/home/con/kernel/dontdiff linux-2.6.11-ck7/kernel/sched.c linux-2.6.11-ck8/kernel/sched.c --- linux-2.6.11-ck7/kernel/sched.c 2005-05-01 10:49:01.000000000 +1000 +++ linux-2.6.11-ck8/kernel/sched.c 2005-05-14 18:08:03.000000000 +1000 @@ -18,7 +18,7 @@ * 2004-04-02 Scheduler domains code by Nick Piggin * 2005-04-20 New staircase scheduling policy by Con Kolivas with help * from William Lee Irwin III, Zwane Mwaikambo & Peter Williams. - * Staircase v11 + * Staircase v11.2 */ #include @@ -684,7 +684,9 @@ static inline void recalc_task_prio(task * sleep_time is scaled down by in-kernel system time and by * number of tasks currently running. */ - sleep_time = sleep_time * (100 - rq_systime) / 200 / (rq_running + 1); + sleep_time /= rq_running + 1; + if (rq_systime) + sleep_time = sleep_time / 200 * (100 - rq_systime); p->totalrun += p->runtime; if (NS_TO_JIFFIES(p->totalrun) >= p->slice && diff -Naurp --exclude-from=/home/con/kernel/dontdiff linux-2.6.11-ck7/MAINTAINERS linux-2.6.11-ck8/MAINTAINERS --- linux-2.6.11-ck7/MAINTAINERS 2005-03-02 19:30:24.000000000 +1100 +++ linux-2.6.11-ck8/MAINTAINERS 2005-05-14 18:08:03.000000000 +1000 @@ -1966,6 +1966,11 @@ M: christer@weinigel.se W: http://www.weinigel.se S: Supported +SECURITY CONTACT +P: Security Officers +M: security@kernel.org +S: Supported + SELINUX SECURITY MODULE P: Stephen Smalley M: sds@epoch.ncsc.mil diff -Naurp --exclude-from=/home/con/kernel/dontdiff linux-2.6.11-ck7/Makefile linux-2.6.11-ck8/Makefile --- linux-2.6.11-ck7/Makefile 2005-05-01 10:49:01.000000000 +1000 +++ linux-2.6.11-ck8/Makefile 2005-05-14 18:08:03.000000000 +1000 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 11 -EXTRAVERSION = -ck7 +EXTRAVERSION = -ck8 NAME=Cognac Woozy Numbat # *DOCUMENTATION* diff -Naurp --exclude-from=/home/con/kernel/dontdiff linux-2.6.11-ck7/REPORTING-BUGS linux-2.6.11-ck8/REPORTING-BUGS --- linux-2.6.11-ck7/REPORTING-BUGS 2004-03-11 21:29:34.000000000 +1100 +++ linux-2.6.11-ck8/REPORTING-BUGS 2005-05-14 18:08:03.000000000 +1000 @@ -16,6 +16,10 @@ code relevant to what you were doing. If describe how to recreate it. That is worth even more than the oops itself. The list of maintainers is in the MAINTAINERS file in this directory. + If it is a security bug, please copy the Security Contact listed +in the MAINTAINERS file. They can help coordinate bugfix and disclosure. +See Documentation/SecurityBugs for more infomation. + If you are totally stumped as to whom to send the report, send it to linux-kernel@vger.kernel.org. (For more information on the linux-kernel mailing list see http://www.tux.org/lkml/).