[kernel/f12/user/myoung/xendom0: 7/8] Merge branch 'f12/master' into f12/user/myoung/xendom0

[myoung]

commit 2279d902a9a53b54c7532be1aa2ea69865140f06
Merge: ba5342c b3e99df
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Mon Nov 29 22:17:14 2010 +0000

    Merge branch 'f12/master' into f12/user/myoung/xendom0
    
    Conflicts:
    	kernel.spec

 ...-sure-we-run-the-same-bytecode-we-audited.patch |  105 +++
 ipc-shm-fix-information-leak-to-user.patch         |   30 +
 ipc-zero-struct-memory-for-compat-fns.patch        |   73 ++
 kernel.spec                                        |   42 +
 ...ink-make-nlmsg_find_attr-take-a-const-ptr.patch |   29 +
 ...karound-to-suppress-problems-with-mt-exec.patch |   60 ++
 tty-icount-changeover-for-other-main-devices.patch |  982 ++++++++++++++++++++
 tty-make-tiocgicount-a-handler.patch               |  218 +++++
 8 files changed, 1539 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index 81c17fc,f71c541..d99e791
--- a/kernel.spec
+++ b/kernel.spec
@@@ -837,10 -835,17 +837,21 @@@ Patch14200: net-do-not-check-capable-if
  # rhbz#596475
  Patch14226: add-support-for-ricoh-e822-sdhci.patch
  
+ Patch14300: ipc-zero-struct-memory-for-compat-fns.patch
+ Patch14301: ipc-shm-fix-information-leak-to-user.patch
+ 
+ Patch14302: inet_diag-make-sure-we-run-the-same-bytecode-we-audited.patch
+ Patch14307: netlink-make-nlmsg_find_attr-take-a-const-ptr.patch
+ 
+ Patch14303: posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
+ 
+ Patch14305: tty-make-tiocgicount-a-handler.patch
+ Patch14306: tty-icount-changeover-for-other-main-devices.patch
+ 
 +Patch19997: xen.pvops.pre.patch
 +Patch19998: xen.pvops.patch
 +Patch19999: xen.pvops.post.patch
 +
  # ==============================================================================
  %endif
  
@@@ -1543,10 -1548,23 +1554,27 @@@ ApplyPatch net-do-not-check-capable-if-
  # rhbz#596475
  ApplyPatch add-support-for-ricoh-e822-sdhci.patch
  
+ # rhbz#648658 (CVE-2010-4073)
+ ApplyPatch ipc-zero-struct-memory-for-compat-fns.patch
+ 
+ # rhbz#648656 (CVE-2010-4072)
+ ApplyPatch ipc-shm-fix-information-leak-to-user.patch
+ 
+ # rhbz#651264 (CVE-2010-3880)
+ ApplyPatch inet_diag-make-sure-we-run-the-same-bytecode-we-audited.patch
+ ApplyPatch netlink-make-nlmsg_find_attr-take-a-const-ptr.patch
+ 
+ # rhbz#656264
+ ApplyPatch posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
+ 
+ # CVE-2010-4077, CVE-2010-4075 (rhbz#648660, #648663)
+ ApplyPatch tty-make-tiocgicount-a-handler.patch
+ ApplyPatch tty-icount-changeover-for-other-main-devices.patch
+ 
 +ApplyPatch xen.pvops.pre.patch
 +ApplyPatch xen.pvops.patch
 +ApplyPatch xen.pvops.post.patch
 +
  # END OF PATCH APPLICATIONS ====================================================
  %endif
  
@@@ -2199,9 -2217,20 +2227,23 @@@ f
  %kernel_variant_files -k vmlinux %{with_kdump} kdump
  
  %changelog
+ * Fri Nov 26 2010 Kyle McMartin <kyle at redhat.com>
+ - netlink-make-nlmsg_find_attr-take-a-const-ptr.patch: quiet build warning
+   the INET_DIAG fix caused.
+ 
+ * Fri Nov 26 2010 Kyle McMartin <kyle at redhat.com>
+ - Plug stack leaks in tty/serial drivers. (#648663, #648660)
+ 
+ * Tue Nov 23 2010 Kyle McMartin <kyle at redhat.com>
+ - zero struct memory in ipc compat (CVE-2010-4073) (#648658)
+ - zero struct memory in ipc shm (CVE-2010-4072) (#648656)
+ - fix logic error in INET_DIAG bytecode auditing (CVE-2010-3880) (#651264)
+ - posix-cpu-timers: workaround to suppress the problems with mt exec
+   (rhbz#656264)
+ 
 +* Tue Nov 23 2010 Michael Young <m.a.young at durham.ac.uk>
 +- update pvops to 2.6.32.26
 +
  * Mon Nov 22 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.26-174
  - Linux 2.6.32.26