[kernel] r6419 - in dists/trunk/linux-2.6: . debian
debian/arch/powerpc debian/patches debian/patches/series
Bastian Blank
waldi at costa.debian.org
Fri Apr 14 15:53:25 UTC 2006
Author: waldi
Date: Fri Apr 14 15:53:22 2006
New Revision: 6419
Added:
dists/trunk/linux-2.6/debian/patches/2.6.16.3
dists/trunk/linux-2.6/debian/patches/2.6.16.4 (contents, props changed)
dists/trunk/linux-2.6/debian/patches/2.6.16.5
dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch
dists/trunk/linux-2.6/debian/patches/series/7
dists/trunk/linux-2.6/debian/patches/series/7-extra
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/arch/powerpc/defines
dists/trunk/linux-2.6/debian/changelog
Log:
Merge /dists/sid/linux-2.6.
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/defines Fri Apr 14 15:53:22 2006
@@ -10,19 +10,17 @@
subarches:
vserver
-[image]
-
[apus]
-depends: mkvmlinuz (>= 18)
+depends: mkvmlinuz (>= 19)
[powerpc]
-depends: mkvmlinuz (>= 18)
+depends: mkvmlinuz (>= 19)
[powerpc-smp]
-depends: mkvmlinuz (>= 18)
+depends: mkvmlinuz (>= 19)
[powerpc-miboot]
-depends: mkvmlinuz (>= 18)
+depends: mkvmlinuz (>= 19)
[powerpc64]
kpkg-subarch: powerpc64
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Fri Apr 14 15:53:22 2006
@@ -1,14 +1,36 @@
linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low
- [ Bastian Blank ]
*
+ -- Bastian Blank <waldi at debian.org> Fri, 14 Apr 2006 17:52:48 +0200
+
+linux-2.6 (2.6.16-7) UNRELEASED; urgency=low
+
+ [ Frederik Schüler ]
+ * Add stable release 2.6.16.3:
+ - Keys: Fix oops when adding key to non-keyring (CVE-2006-1522)
+
+ [ Bastian Blank ]
+ * Add stable release 2.6.16.4:
+ - RCU signal handling (CVE-2006-1523)
+
+ [ Sven Luther ]
+ * [powerpc] Transitioned mkvmlinuz support patch to the 2.6.16 ARCH=powerpc
+ tree. PReP is broken in 2.6.16 though.
+
[ maximilian attems ]
- * Unset CONFIG_SECCOMP.
+ * Add stable release 2.6.16.5:
+ - x86_64: Clean up execve
+ - x86_64: When user could have changed RIP always force IRET (CVE-2006-0744)
+ * Disable CONFIG_SECCOMP (adds useless overhead on context-switch) -
+ thanks to fs for checking abi.
+
+ [ Christian T. Steigies ]
+ * [m68k] update m68k patch and config to 2.6.16, temporarily disable atari
- -- maximilian attems <maks at sternwelten.at> Tue, 11 Apr 2006 01:07:28 +0200
+ -- maximilian attems <maks at sternwelten.at> Thu, 13 Apr 2006 11:16:42 +0200
-linux-2.6 (2.6.16-6) UNRELEASED; urgency=low
+linux-2.6 (2.6.16-6) unstable; urgency=medium
[ Bastian Blank ]
* Provide version infos in support package and don't longer rely on the
@@ -43,7 +65,7 @@
- Fix the p4-clockmod N60 errata workaround.
- kdump proc vmcore size oveflow fix
- -- Bastian Blank <waldi at debian.org> Fri, 7 Apr 2006 22:58:17 +0200
+ -- Bastian Blank <waldi at debian.org> Mon, 10 Apr 2006 16:09:51 +0200
linux-2.6 (2.6.16-5) unstable; urgency=low
Added: dists/trunk/linux-2.6/debian/patches/2.6.16.3
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/2.6.16.3 Fri Apr 14 15:53:22 2006
@@ -0,0 +1,27 @@
+diff --git a/security/keys/key.c b/security/keys/key.c
+index 99781b7..0e2584e 100644
+--- a/security/keys/key.c
++++ b/security/keys/key.c
+@@ -785,6 +785,10 @@ key_ref_t key_create_or_update(key_ref_t
+
+ key_check(keyring);
+
++ key_ref = ERR_PTR(-ENOTDIR);
++ if (keyring->type != &key_type_keyring)
++ goto error_2;
++
+ down_write(&keyring->sem);
+
+ /* if we're going to allocate a new key, we're going to have
+diff --git a/security/keys/keyring.c b/security/keys/keyring.c
+index d65a180..bffa924 100644
+--- a/security/keys/keyring.c
++++ b/security/keys/keyring.c
+@@ -437,6 +437,7 @@ EXPORT_SYMBOL(keyring_search);
+ /*
+ * search the given keyring only (no recursion)
+ * - keyring must be locked by caller
++ * - caller must guarantee that the keyring is a keyring
+ */
+ key_ref_t __keyring_search_one(key_ref_t keyring_ref,
+ const struct key_type *ktype,
Added: dists/trunk/linux-2.6/debian/patches/2.6.16.4
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/2.6.16.4 Fri Apr 14 15:53:22 2006
@@ -0,0 +1,12 @@
+diff --git a/kernel/signal.c b/kernel/signal.c
+index ea15410..bc8f80b 100644
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -975,7 +975,6 @@ __group_complete_signal(int sig, struct
+ if (t == NULL)
+ /* restart balancing at this thread */
+ t = p->signal->curr_target = p;
+- BUG_ON(t->tgid != p->tgid);
+
+ while (!wants_signal(sig, t)) {
+ t = next_thread(t);
Added: dists/trunk/linux-2.6/debian/patches/2.6.16.5
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/2.6.16.5 Fri Apr 14 15:53:22 2006
@@ -0,0 +1,63 @@
+diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
+index 7c10e90..ab6e44d 100644
+--- a/arch/x86_64/kernel/entry.S
++++ b/arch/x86_64/kernel/entry.S
+@@ -180,6 +180,10 @@ rff_trace:
+ *
+ * XXX if we had a free scratch register we could save the RSP into the stack frame
+ * and report it properly in ps. Unfortunately we haven't.
++ *
++ * When user can change the frames always force IRET. That is because
++ * it deals with uncanonical addresses better. SYSRET has trouble
++ * with them due to bugs in both AMD and Intel CPUs.
+ */
+
+ ENTRY(system_call)
+@@ -254,7 +258,10 @@ sysret_signal:
+ xorl %esi,%esi # oldset -> arg2
+ call ptregscall_common
+ 1: movl $_TIF_NEED_RESCHED,%edi
+- jmp sysret_check
++ /* Use IRET because user could have changed frame. This
++ works because ptregscall_common has called FIXUP_TOP_OF_STACK. */
++ cli
++ jmp int_with_check
+
+ badsys:
+ movq $-ENOSYS,RAX-ARGOFFSET(%rsp)
+@@ -280,7 +287,8 @@ tracesys:
+ call syscall_trace_leave
+ RESTORE_TOP_OF_STACK %rbx
+ RESTORE_REST
+- jmp ret_from_sys_call
++ /* Use IRET because user could have changed frame */
++ jmp int_ret_from_sys_call
+ CFI_ENDPROC
+
+ /*
+@@ -408,25 +416,9 @@ ENTRY(stub_execve)
+ CFI_ADJUST_CFA_OFFSET -8
+ CFI_REGISTER rip, r11
+ SAVE_REST
+- movq %r11, %r15
+- CFI_REGISTER rip, r15
+ FIXUP_TOP_OF_STACK %r11
+ call sys_execve
+- GET_THREAD_INFO(%rcx)
+- bt $TIF_IA32,threadinfo_flags(%rcx)
+- CFI_REMEMBER_STATE
+- jc exec_32bit
+ RESTORE_TOP_OF_STACK %r11
+- movq %r15, %r11
+- CFI_REGISTER rip, r11
+- RESTORE_REST
+- pushq %r11
+- CFI_ADJUST_CFA_OFFSET 8
+- CFI_REL_OFFSET rip, 0
+- ret
+-
+-exec_32bit:
+- CFI_RESTORE_STATE
+ movq %rax,RAX(%rsp)
+ RESTORE_REST
+ jmp int_ret_from_sys_call
Added: dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch Fri Apr 14 15:53:22 2006
@@ -0,0 +1,57 @@
+#
+# Mkvmlinuz support patch, called by debian's kernel-package to generate
+# the files needed by mkvmlinuz to generate the bootable images from vmlinux.
+# Author: Sven Luther <luther at debian.org>
+# Based on work from: Jens Schmalzing <jensen at debian.org>
+# Original comment from Jens :
+# This shell script is intended to be put into the debian subdirectory
+# of a Linux kernel tree, where make-kpkg will find and execute it
+# while building a kernel-image package. The purpose of this script
+# is to add glue (object code, libraries, utilities and so on) from
+# the kernel tree to the kernel-image package. Later, the mkvmlinuz
+# utility, which is available as a separate Debian package, can use
+# this glue to create a bootable compressed kernel from the
+# uncompressed kernel in the kernel-image package and optionally a
+# ramdisk. This is especially important on PowerPC subarchitectures
+# that don't have a boot loader, but also comes handy for rescue
+# systems and the like.
+# Upstream status: This patch stays a debian specific patch for now,
+# but it is not in a form where it could go upstream.
+#
+--- linux-2.6.16/arch/powerpc/Makefile.orig 2006-04-12 16:57:16.000000000 +0000
++++ linux-2.6.16/arch/powerpc/Makefile 2006-04-12 16:58:53.000000000 +0000
+@@ -148,7 +148,7 @@
+
+ CPPFLAGS_vmlinux.lds := -Upowerpc
+
+-BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage
++BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage mkvmlinuz_support_install
+
+ .PHONY: $(BOOT_TARGETS)
+
+--- linux-2.6.16/arch/powerpc/boot/Makefile.orig 2006-04-12 16:40:11.000000000 +0000
++++ linux-2.6.16/arch/powerpc/boot/Makefile 2006-04-12 19:23:06.000000000 +0000
+@@ -213,3 +213,23 @@
+ sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" "$(BOOTIMAGE)"
+
+ clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip)
++
++#-----------------------------------------------------------
++# install mkvmlinuz support files
++#-----------------------------------------------------------
++quiet_cmd_mkvmlinuz = INSTALL mkvmlinuz support files
++ cmd_mkvmlinuz = cp -f $? $(INSTALL_MKVMLINUZ)
++
++mkvmlinuz-obj-sec = $(foreach section, $(1), $(patsubst %,$(obj)/mkvmlinuz-kernel-%.o, $(section)))
++mkvmlinuz-src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/mkvmlinuz-kernel-%.c, $(section)))
++
++$(call mkvmlinuz-src-sec, $(required) $(initrd)): $(obj)/mkvmlinuz-kernel-%.c:
++ @touch $@
++$(call mkvmlinuz-obj-sec, $(required) $(initrd)): $(obj)/mkvmlinuz-kernel-%.o: $(obj)/mkvmlinuz-kernel-%.c
++ $(call if_changed_dep,bootcc)
++
++$(obj)/mkvmlinuz_support_install: $(obj)/addRamDisk $(obj)/addnote $(obj-boot) $(call mkvmlinuz-obj-sec, $(required) $(initrd)) $(srctree)/$(src)/zImage.lds
++ mkdir -p $(INSTALL_MKVMLINUZ)
++ $(call cmd,mkvmlinuz)
++targets += mkvmlinuz_support_install
++
Added: dists/trunk/linux-2.6/debian/patches/series/7
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/series/7 Fri Apr 14 15:53:22 2006
@@ -0,0 +1,4 @@
++ 2.6.16.3
++ 2.6.16.4
++ powerpc-mkvmlinuz-support-2.patch
++ 2.6.16.5
Added: dists/trunk/linux-2.6/debian/patches/series/7-extra
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/series/7-extra Fri Apr 14 15:53:22 2006
@@ -0,0 +1 @@
++ m68k-2.6.16.patch m68k
More information about the Kernel-svn-changes
mailing list