ChangeSet 1.1889, 2005/05/30 21:35:36+01:00, iap10@xxxxxxxxxxxxxxxxxxxxx
Upgrade to Linux patch 2.6.11.11
Signed-off-by: ian@xxxxxxxxxxxxx
b/patches/linux-2.6.11/linux-2.6.11.11.patch | 1762 +++++++++++++++++++++++++++
patches/linux-2.6.11/linux-2.6.11.10.patch | 1461 ----------------------
2 files changed, 1762 insertions(+), 1461 deletions(-)
diff -Nru a/patches/linux-2.6.11/linux-2.6.11.10.patch
b/patches/linux-2.6.11/linux-2.6.11.10.patch
--- a/patches/linux-2.6.11/linux-2.6.11.10.patch 2005-05-30 20:03:09
-04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,1737 +0,0 @@
-diff -Naur linux-2.6.11/Documentation/SecurityBugs
linux-2.6.11.10/Documentation/SecurityBugs
---- linux-2.6.11/Documentation/SecurityBugs 1969-12-31 16:00:00.000000000
-0800
-+++ linux-2.6.11.10/Documentation/SecurityBugs 2005-05-16 10:50:30.000000000
-0700
-@@ -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
-+<security@xxxxxxxxxx>. 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 -Naur linux-2.6.11/MAINTAINERS linux-2.6.11.10/MAINTAINERS
---- linux-2.6.11/MAINTAINERS 2005-03-01 23:38:10.000000000 -0800
-+++ linux-2.6.11.10/MAINTAINERS 2005-05-16 10:50:30.000000000 -0700
-@@ -1966,6 +1966,11 @@
- W: http://www.weinigel.se
- S: Supported
-
-+SECURITY CONTACT
-+P: Security Officers
-+M: security@xxxxxxxxxx
-+S: Supported
-+
- SELINUX SECURITY MODULE
- P: Stephen Smalley
- M: sds@xxxxxxxxxxxxxx
-diff -Naur linux-2.6.11/Makefile linux-2.6.11.10/Makefile
---- linux-2.6.11/Makefile 2005-03-01 23:38:13.000000000 -0800
-+++ linux-2.6.11.10/Makefile 2005-05-16 10:50:30.000000000 -0700
-@@ -1,8 +1,8 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 11
--EXTRAVERSION =
--NAME=Woozy Numbat
-+EXTRAVERSION = .10
-+NAME=Woozy Beaver
-
- # *DOCUMENTATION*
- # To see a list of typical targets execute "make help"
-diff -Naur linux-2.6.11/REPORTING-BUGS linux-2.6.11.10/REPORTING-BUGS
---- linux-2.6.11/REPORTING-BUGS 2005-03-01 23:38:09.000000000 -0800
-+++ linux-2.6.11.10/REPORTING-BUGS 2005-05-16 10:50:30.000000000 -0700
-@@ -16,6 +16,10 @@
- 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@xxxxxxxxxxxxxxxx (For more information on the linux-kernel
- mailing list see http://www.tux.org/lkml/).
-diff -Naur linux-2.6.11/arch/ia64/kernel/fsys.S
linux-2.6.11.10/arch/ia64/kernel/fsys.S
---- linux-2.6.11/arch/ia64/kernel/fsys.S 2005-03-01 23:38:34.000000000
-0800
-+++ linux-2.6.11.10/arch/ia64/kernel/fsys.S 2005-05-16 10:50:30.000000000
-0700
-@@ -611,8 +611,10 @@
- movl r2=ia64_ret_from_syscall
- ;;
- mov rp=r2 // set the real return addr
-- tbit.z p8,p0=r3,TIF_SYSCALL_TRACE
-+ and r3=_TIF_SYSCALL_TRACEAUDIT,r3
- ;;
-+ cmp.eq p8,p0=r3,r0
-+
- (p10) br.cond.spnt.many ia64_ret_from_syscall // p10==true means out
registers are more than 8
- (p8) br.call.sptk.many b6=b6 // ignore this return addr
- br.cond.sptk ia64_trace_syscall
-diff -Naur linux-2.6.11/arch/ia64/kernel/signal.c
linux-2.6.11.10/arch/ia64/kernel/signal.c
---- linux-2.6.11/arch/ia64/kernel/signal.c 2005-03-01 23:38:10.000000000
-0800
-+++ linux-2.6.11.10/arch/ia64/kernel/signal.c 2005-05-16 10:50:30.000000000
-0700
-@@ -224,7 +224,8 @@
- * could be corrupted.
- */
- retval = (long) &ia64_leave_kernel;
-- if (test_thread_flag(TIF_SYSCALL_TRACE))
-+ if (test_thread_flag(TIF_SYSCALL_TRACE)
-+ || test_thread_flag(TIF_SYSCALL_AUDIT))
- /*
- * strace expects to be notified after sigreturn returns even
though the
- * context to which we return may not be in the middle of a
syscall.
-diff -Naur linux-2.6.11/arch/ppc/oprofile/op_model_fsl_booke.c
linux-2.6.11.10/arch/ppc/oprofile/op_model_fsl_booke.c
---- linux-2.6.11/arch/ppc/oprofile/op_model_fsl_booke.c 2005-03-01
23:38:33.000000000 -0800
-+++ linux-2.6.11.10/arch/ppc/oprofile/op_model_fsl_booke.c 2005-05-16
10:50:31.000000000 -0700
-@@ -150,7 +150,6 @@
- int is_kernel;
- int val;
- int i;
-- unsigned int cpu = smp_processor_id();
-
- /* set the PMM bit (see comment below) */
- mtmsr(mfmsr() | MSR_PMM);
-@@ -162,7 +161,7 @@
- val = ctr_read(i);
- if (val < 0) {
- if (oprofile_running && ctr[i].enabled) {
-- oprofile_add_sample(pc, is_kernel, i, cpu);
-+ oprofile_add_pc(pc, is_kernel, i);
- ctr_write(i, reset_value[i]);
- } else {
- ctr_write(i, 0);
-diff -Naur linux-2.6.11/arch/ppc/platforms/4xx/ebony.h
linux-2.6.11.10/arch/ppc/platforms/4xx/ebony.h
---- linux-2.6.11/arch/ppc/platforms/4xx/ebony.h 2005-03-01
23:38:18.000000000 -0800
-+++ linux-2.6.11.10/arch/ppc/platforms/4xx/ebony.h 2005-05-16
10:50:31.000000000 -0700
-@@ -61,8 +61,8 @@
- */
-
- /* OpenBIOS defined UART mappings, used before early_serial_setup */
--#define UART0_IO_BASE (u8 *) 0xE0000200
--#define UART1_IO_BASE (u8 *) 0xE0000300
-+#define UART0_IO_BASE 0xE0000200
-+#define UART1_IO_BASE 0xE0000300
-
- /* external Epson SG-615P */
- #define BASE_BAUD 691200
-diff -Naur linux-2.6.11/arch/ppc/platforms/4xx/luan.h
linux-2.6.11.10/arch/ppc/platforms/4xx/luan.h
---- linux-2.6.11/arch/ppc/platforms/4xx/luan.h 2005-03-01 23:38:13.000000000
-0800
-+++ linux-2.6.11.10/arch/ppc/platforms/4xx/luan.h 2005-05-16
10:50:31.000000000 -0700
-@@ -47,9 +47,9 @@
- #define RS_TABLE_SIZE 3
-
- /* PIBS defined UART mappings, used before early_serial_setup */
--#define UART0_IO_BASE (u8 *) 0xa0000200
--#define UART1_IO_BASE (u8 *) 0xa0000300
--#define UART2_IO_BASE (u8 *) 0xa0000600
-+#define UART0_IO_BASE 0xa0000200
-+#define UART1_IO_BASE 0xa0000300
-+#define UART2_IO_BASE 0xa0000600
-
- #define BASE_BAUD 11059200
- #define STD_UART_OP(num) \
-diff -Naur linux-2.6.11/arch/ppc/platforms/4xx/ocotea.h
linux-2.6.11.10/arch/ppc/platforms/4xx/ocotea.h
---- linux-2.6.11/arch/ppc/platforms/4xx/ocotea.h 2005-03-01
23:38:08.000000000 -0800
-+++ linux-2.6.11.10/arch/ppc/platforms/4xx/ocotea.h 2005-05-16
10:50:31.000000000 -0700
-@@ -56,8 +56,8 @@
- #define RS_TABLE_SIZE 2
-
- /* OpenBIOS defined UART mappings, used before early_serial_setup */
--#define UART0_IO_BASE (u8 *) 0xE0000200
--#define UART1_IO_BASE (u8 *) 0xE0000300
-+#define UART0_IO_BASE 0xE0000200
-+#define UART1_IO_BASE 0xE0000300
-
- #define BASE_BAUD 11059200/16
- #define STD_UART_OP(num) \
-diff -Naur linux-2.6.11/arch/sparc/kernel/ptrace.c
linux-2.6.11.10/arch/sparc/kernel/ptrace.c
---- linux-2.6.11/arch/sparc/kernel/ptrace.c 2005-03-01 23:38:33.000000000
-0800
-+++ linux-2.6.11.10/arch/sparc/kernel/ptrace.c 2005-05-16 10:50:31.000000000
-0700
-@@ -531,18 +531,6 @@
- pt_error_return(regs, EIO);
- goto out_tsk;
- }
-- if (addr != 1) {
-- if (addr & 3) {
-- pt_error_return(regs, EINVAL);
-- goto out_tsk;
-- }
--#ifdef DEBUG_PTRACE
-- printk ("Original: %08lx %08lx\n",
child->thread.kregs->pc, child->thread.kregs->npc);
-- printk ("Continuing with %08lx %08lx\n", addr, addr+4);
--#endif
-- child->thread.kregs->pc = addr;
-- child->thread.kregs->npc = addr + 4;
-- }
-
- if (request == PTRACE_SYSCALL)
- set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-diff -Naur linux-2.6.11/arch/sparc64/kernel/ptrace.c
linux-2.6.11.10/arch/sparc64/kernel/ptrace.c
---- linux-2.6.11/arch/sparc64/kernel/ptrace.c 2005-03-01 23:38:32.000000000
-0800
-+++ linux-2.6.11.10/arch/sparc64/kernel/ptrace.c 2005-05-16
10:50:31.000000000 -0700
-@@ -514,25 +514,6 @@
- pt_error_return(regs, EIO);
- goto out_tsk;
- }
-- if (addr != 1) {
-- unsigned long pc_mask = ~0UL;
--
-- if ((child->thread_info->flags & _TIF_32BIT) != 0)
-- pc_mask = 0xffffffff;
--
-- if (addr & 3) {
-- pt_error_return(regs, EINVAL);
-- goto out_tsk;
-- }
--#ifdef DEBUG_PTRACE
-- printk ("Original: %016lx %016lx\n",
-- child->thread_info->kregs->tpc,
-- child->thread_info->kregs->tnpc);
-- printk ("Continuing with %016lx %016lx\n", addr,
addr+4);
--#endif
-- child->thread_info->kregs->tpc = (addr & pc_mask);
-- child->thread_info->kregs->tnpc = ((addr + 4) &
pc_mask);
-- }
-
- if (request == PTRACE_SYSCALL) {
- set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-diff -Naur linux-2.6.11/arch/sparc64/kernel/signal32.c
linux-2.6.11.10/arch/sparc64/kernel/signal32.c
---- linux-2.6.11/arch/sparc64/kernel/signal32.c 2005-03-01
23:38:34.000000000 -0800
-+++ linux-2.6.11.10/arch/sparc64/kernel/signal32.c 2005-05-16
10:50:31.000000000 -0700
-@@ -192,10 +192,13 @@
- err |= __put_user(from->si_uid, &to->si_uid);
- break;
- case __SI_FAULT >> 16:
-- case __SI_POLL >> 16:
- err |= __put_user(from->si_trapno, &to->si_trapno);
- err |= __put_user((unsigned long)from->si_addr,
&to->si_addr);
- break;
-+ case __SI_POLL >> 16:
-+ err |= __put_user(from->si_band, &to->si_band);
-+ err |= __put_user(from->si_fd, &to->si_fd);
-+ break;
- case __SI_RT >> 16: /* This is not generated by the kernel as
of now. */
- case __SI_MESGQ >> 16:
- err |= __put_user(from->si_pid, &to->si_pid);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home