rpms/kernel/F-9 patch-2.6.25.10.bz2.sign, NONE, 1.1 .cvsignore, 1.817, 1.818 kernel.spec, 1.700, 1.701 linux-2.6-upstream-reverts.patch, 1.5, 1.6 sources, 1.778, 1.779 upstream, 1.697, 1.698 patch-2.6.25.9.bz2.sign, 1.1, NONE

Thu Jul 3 21:18:27 UTC 2008

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6985

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
	patch-2.6.25.10.bz2.sign 
Removed Files:
	patch-2.6.25.9.bz2.sign 
Log Message:
* Thu Jul 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.9-82
- Linux 2.6.25.10
- Reverted stable patch, not needed with utrace:
	x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch
- Reverted part of this stable patch against drivers/net/wireless/strip.c
  (the driver eventually gets removed as part of the wireless updates):
	tty-fix-for-tty-operations-bugs.patch

--- NEW FILE patch-2.6.25.10.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIbE5NyGugalF9Dw4RAkZqAJ9T1YQYand/tLR5isI1DMct3RhhuQCZAdjV
H7HfaUokzltPAe5iCxFbHjE=
=THSv
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.817
retrieving revision 1.818
diff -u -r1.817 -r1.818
--- .cvsignore	25 Jun 2008 02:48:49 -0000	1.817
+++ .cvsignore	3 Jul 2008 21:17:31 -0000	1.818
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.25
 linux-2.6.25.tar.bz2
-patch-2.6.25.9.bz2
+patch-2.6.25.10.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.700
retrieving revision 1.701
diff -u -r1.700 -r1.701
--- kernel.spec	2 Jul 2008 22:04:18 -0000	1.700
+++ kernel.spec	3 Jul 2008 21:17:32 -0000	1.701
@@ -31,7 +31,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.21.y update to apply?
-%define stable_update 9
+%define stable_update 10
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1861,6 +1861,14 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Thu Jul 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.9-82
+- Linux 2.6.25.10
+- Reverted stable patch, not needed with utrace:
+	x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch
+- Reverted part of this stable patch against drivers/net/wireless/strip.c
+  (the driver eventually gets removed as part of the wireless updates):
+	tty-fix-for-tty-operations-bugs.patch
+
 * Wed Jul 02 2008 John W. Linville <linville at redhat.com> 2.6.25.9-81
 - Upstream wireless updates from 2008-06-30
   (http://marc.info/?l=linux-wireless&m=121486432315033&w=2)

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-upstream-reverts.patch	23 Jun 2008 17:35:34 -0000	1.5
+++ linux-2.6-upstream-reverts.patch	3 Jul 2008 21:17:32 -0000	1.6
@@ -459,3 +459,131 @@
  	ring->nr_slots = nr_slots;
  	ring->mmio_base = b43_dmacontroller_base(type, controller_index);
  	ring->index = controller_index;
+From stable-bounces at linux.kernel.org Fri Jun 27 14:44:11 2008
+From: Roland McGrath <roland at redhat.com>
+Date: Fri, 27 Jun 2008 13:48:29 -0700 (PDT)
+Subject: x86_64 ptrace: fix sys32_ptrace task_struct leak
+To: stable at kernel.org
+Cc: Pekka Enberg <penberg at cs.helsinki.fi>, Jeff Dike <jdike at addtoit.com>, Joris van Rantwijk <jorispubl at xs4all.nl>, linux-kernel at vger.kernel.org, Thorsten Knabe <linux at thorsten-knabe.de>
+Message-ID: <20080627204953.D7D8A154223 at magilla.localdomain>
+
+From: Roland McGrath <roland at redhat.com>
+
+Commit 5a4646a4efed8c835f76c3b88f3155f6ab5b8d9b introduced a leak of
+task_struct refs into sys32_ptrace.  This bug has already gone away in
+for 2.6.26 in commit 562b80bafffaf42a6d916b0a2ee3d684220a1c10.
+
+Signed-off-by: Roland McGrath <roland at redhat.com>
+Acked-by: Ingo Molnar <mingo at elte.hu>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ arch/x86/kernel/ptrace.c |   45 ++++++++++++++++++++++++++-------------------
+ 1 file changed, 26 insertions(+), 19 deletions(-)
+
+--- a/arch/x86/kernel/ptrace.c
++++ b/arch/x86/kernel/ptrace.c
+@@ -1309,42 +1309,49 @@ asmlinkage long sys32_ptrace(long reques
+ 		break;
+ 
+ 	case PTRACE_GETREGS:	/* Get all gp regs from the child. */
+-		return copy_regset_to_user(child, &user_x86_32_view,
+-					   REGSET_GENERAL,
+-					   0, sizeof(struct user_regs_struct32),
+-					   datap);
++		ret = copy_regset_to_user(child, &user_x86_32_view,
++					  REGSET_GENERAL,
++					  0, sizeof(struct user_regs_struct32),
++					  datap);
++		break;
+ 
+ 	case PTRACE_SETREGS:	/* Set all gp regs in the child. */
+-		return copy_regset_from_user(child, &user_x86_32_view,
+-					     REGSET_GENERAL, 0,
+-					     sizeof(struct user_regs_struct32),
+-					     datap);
++		ret = copy_regset_from_user(child, &user_x86_32_view,
++					    REGSET_GENERAL, 0,
++					    sizeof(struct user_regs_struct32),
++					    datap);
++		break;
+ 
+ 	case PTRACE_GETFPREGS:	/* Get the child FPU state. */
+-		return copy_regset_to_user(child, &user_x86_32_view,
+-					   REGSET_FP, 0,
+-					   sizeof(struct user_i387_ia32_struct),
+-					   datap);
++		ret = copy_regset_to_user(child, &user_x86_32_view,
++					  REGSET_FP, 0,
++					  sizeof(struct user_i387_ia32_struct),
++					  datap);
++		break;
+ 
+ 	case PTRACE_SETFPREGS:	/* Set the child FPU state. */
+-		return copy_regset_from_user(
++		ret = copy_regset_from_user(
+ 			child, &user_x86_32_view, REGSET_FP,
+ 			0, sizeof(struct user_i387_ia32_struct), datap);
++		break;
+ 
+ 	case PTRACE_GETFPXREGS:	/* Get the child extended FPU state. */
+-		return copy_regset_to_user(child, &user_x86_32_view,
+-					   REGSET_XFP, 0,
+-					   sizeof(struct user32_fxsr_struct),
+-					   datap);
++		ret = copy_regset_to_user(child, &user_x86_32_view,
++					  REGSET_XFP, 0,
++					  sizeof(struct user32_fxsr_struct),
++					  datap);
++		break;
+ 
+ 	case PTRACE_SETFPXREGS:	/* Set the child extended FPU state. */
+-		return copy_regset_from_user(child, &user_x86_32_view,
++		ret = copy_regset_from_user(child, &user_x86_32_view,
+ 					     REGSET_XFP, 0,
+ 					     sizeof(struct user32_fxsr_struct),
+ 					     datap);
++		break;
+ 
+ 	default:
+-		return compat_ptrace_request(child, request, addr, data);
++		ret = compat_ptrace_request(child, request, addr, data);
++		break;
+ 	}
+ 
+  out:
+From alan at lxorguk.ukuu.org.uk Fri Jun 27 07:39:26 2008
+From: Alan Cox <alan at lxorguk.ukuu.org.uk>
+Date: Fri, 27 Jun 2008 15:21:55 +0100
+Subject: TTY: fix for tty operations bugs
+To: greg at kroah.com
+Message-ID: <20080627152155.50f0ebae at lxorguk.ukuu.org.uk>
+
+From: Alan Cox <alan at lxorguk.ukuu.org.uk>
+
+This is fixed with the recent tty operations rewrite in mainline in a
+different way, this is a selective backport of the relevant portions to
+the -stable tree.
+
+Signed-off-by: Alan Cox <alan at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/net/wireless/strip.c |    3 ++-
+
+  *****************
+  * NOTE: reverting only the changes to drivers/net/wireless/strip.c
+  *****************
+
+--- a/drivers/net/wireless/strip.c
++++ b/drivers/net/wireless/strip.c
+@@ -802,7 +802,8 @@ static void set_baud(struct tty_struct *
+ 	struct ktermios old_termios = *(tty->termios);
+ 	tty->termios->c_cflag &= ~CBAUD;	/* Clear the old baud setting */
+ 	tty->termios->c_cflag |= baudcode;	/* Set the new baud setting */
+-	tty->driver->set_termios(tty, &old_termios);
++	if (tty->driver->set_termios)
++		tty->driver->set_termios(tty, &old_termios);
+ }
+ 
+ /*


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.778
retrieving revision 1.779
diff -u -r1.778 -r1.779
--- sources	25 Jun 2008 02:48:49 -0000	1.778
+++ sources	3 Jul 2008 21:17:32 -0000	1.779
@@ -1,2 +1,2 @@
 db95a49a656a3247d4995a797d333153  linux-2.6.25.tar.bz2
-493a0b7dd145d4f378ce3970e3690320  patch-2.6.25.9.bz2
+ad3c4b32bf293722500160a2bb6100b6  patch-2.6.25.10.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.697
retrieving revision 1.698
diff -u -r1.697 -r1.698
--- upstream	25 Jun 2008 02:48:49 -0000	1.697
+++ upstream	3 Jul 2008 21:17:32 -0000	1.698
@@ -1,2 +1,2 @@
 linux-2.6.25.tar.bz2
-patch-2.6.25.9.bz2
+patch-2.6.25.10.bz2


--- patch-2.6.25.9.bz2.sign DELETED ---


