[kernel/f14/master] Linux 2.6.35.13
Chuck Ebbert
cebbert at fedoraproject.org
Thu Apr 28 16:40:07 UTC 2011
commit 9e4696b4a4944dde4fd61426d6ed48df8d39b294
Author: Chuck Ebbert <cebbert at redhat.com>
Date: Thu Apr 28 12:40:29 2011 -0400
Linux 2.6.35.13
btusb-macbookpro-6-2.patch | 4 +-
...-sure-we-run-the-same-bytecode-we-audited.patch | 105 ------
iwlagn-support-new-5000-microcode.patch | 38 --
kernel.spec | 20 +-
linux-2.6-upstream-reverts.patch | 227 ------------
...-cpu-counter-threshold-when-memory-is-low.patch | 390 --------------------
...ink-make-nlmsg_find_attr-take-a-const-ptr.patch | 29 --
sources | 2 +-
8 files changed, 8 insertions(+), 807 deletions(-)
---
diff --git a/btusb-macbookpro-6-2.patch b/btusb-macbookpro-6-2.patch
index d65a309..9b452f7 100644
--- a/btusb-macbookpro-6-2.patch
+++ b/btusb-macbookpro-6-2.patch
@@ -34,8 +34,8 @@ index eac44e4..320e798 100644
+ /* Apple MacBookPro6,2 */
+ { USB_DEVICE(0x05ac, 0x8218) },
+
- /* AVM BlueFRITZ! USB v2.0 */
- { USB_DEVICE(0x057c, 0x3800) },
+ /* Apple MacBookPro8,2 */
+ { USB_DEVICE(0x05ac, 0x821a) },
--
1.7.2.3
diff --git a/kernel.spec b/kernel.spec
index b648bab..434fb77 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
# reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
# scripts/rebase.sh should be made to do that for you, actually.
#
-%global baserelease 90
+%global baserelease 91
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -60,7 +60,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 12
+%define stable_update 13
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -670,7 +670,6 @@ Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
Patch700: linux-2.6-e1000-ich9-montevina.patch
-Patch701: iwlagn-support-new-5000-microcode.patch
Patch800: linux-2.6-crash-driver.patch
@@ -785,16 +784,12 @@ Patch13645: tpm-autodetect-itpm-devices.patch
Patch13652: fix-i8k-inline-asm.patch
-Patch13653: inet_diag-make-sure-we-run-the-same-bytecode-we-audited.patch
-Patch13654: netlink-make-nlmsg_find_attr-take-a-const-ptr.patch
-
Patch13660: rtl8180-improve-signal-reporting-for-rtl8185-hardware.patch
Patch13661: rtl8180-improve-signal-reporting-for-actual-rtl8180-hardware.patch
Patch13684: tty-make-tiocgicount-a-handler.patch
Patch13685: tty-icount-changeover-for-other-main-devices.patch
-Patch13690: mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
Patch13691: mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch
Patch13692: orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch
@@ -1367,9 +1362,6 @@ ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
# Networking
-# rhbz#695712
-ApplyPatch iwlagn-support-new-5000-microcode.patch
-
# Misc fixes
# The input layer spews crap no-one cares about.
ApplyPatch linux-2.6-input-kill-stupid-messages.patch
@@ -1528,10 +1520,6 @@ ApplyPatch tpm-autodetect-itpm-devices.patch
ApplyPatch fix-i8k-inline-asm.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
-
ApplyPatch rtl8180-improve-signal-reporting-for-rtl8185-hardware.patch
ApplyPatch rtl8180-improve-signal-reporting-for-actual-rtl8180-hardware.patch
@@ -1540,7 +1528,6 @@ ApplyPatch tty-make-tiocgicount-a-handler.patch
ApplyPatch tty-icount-changeover-for-other-main-devices.patch
# backport some fixes for kswapd from mmotm, rhbz#649694
-ApplyPatch mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
ApplyPatch mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch
# rhbz#657864
@@ -2162,6 +2149,9 @@ fi
# and build.
%changelog
+* Thu Apr 29 2011 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.35.13
+
* Fri Apr 22 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.35.12-90
- iwlagn-support-new-5000-microcode.patch: stable submission patch from
sgruszka to support newer microcode versions with the iwl5000 hardware.
diff --git a/linux-2.6-upstream-reverts.patch b/linux-2.6-upstream-reverts.patch
index c447c5a..50f70fd 100644
--- a/linux-2.6-upstream-reverts.patch
+++ b/linux-2.6-upstream-reverts.patch
@@ -1,230 +1,3 @@
-From foo
-From: David Howells <dhowells at redhat.com>
-Subject: Fix cred leak in AF_NETLINK
-
-Patch cab9e9848b9a8283b0504a2d7c435a9f5ba026de to the 2.6.35.y stable tree
-stored a ref to the current cred struct in struct scm_cookie. This was fine
-with AF_UNIX as that calls scm_destroy() from its packet sending functions, but
-AF_NETLINK, which also uses scm_send(), does not call scm_destroy() - meaning
-that the copied credentials leak each time SCM data is sent over a netlink
-socket.
-
-This can be triggered quite simply on a Fedora 13 or 14 userspace with the
-2.6.35.11 kernel (or something based off of that) by calling:
-
- #!/bin/bash
- for ((i=0; i<100; i++))
- do
- su - -c /bin/true
- cut -d: -f1 /proc/slabinfo | grep 'cred\|key\|task_struct'
- cat /proc/keys | wc -l
- done
-
-This leaks the session key that pam_keyinit creates for 'su -', which appears
-in /proc/keys as being revoked (has the R flag set against it) afterward su is
-called.
-
-Furthermore, if CONFIG_SLAB=y, then the cred and key slab object usage counts
-can be viewed and seen to increase. The key slab increases by one object per
-loop, and this can be seen after the system has had a couple of minutes to
-stand after the script above has been run on it.
-
-If the system is working correctly, the key and cred counts should return to
-roughly what they were before.
-
-Signed-off-by: David Howells <dhowells at redhat.com>
-Signed-off-by: Andi Kleen <ak at linux.intel.com>
-
----
-
- net/netlink/af_netlink.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-Index: linux-2.6.35.y/net/netlink/af_netlink.c
-===================================================================
---- linux-2.6.35.y.orig/net/netlink/af_netlink.c 2011-03-29 22:52:05.032059161 -0700
-+++ linux-2.6.35.y/net/netlink/af_netlink.c 2011-03-29 23:53:42.295455441 -0700
-@@ -1330,12 +1330,16 @@
- return err;
-
- if (msg->msg_namelen) {
-- if (addr->nl_family != AF_NETLINK)
-- return -EINVAL;
-+ if (addr->nl_family != AF_NETLINK) {
-+ err = -EINVAL;
-+ goto out;
-+ }
- dst_pid = addr->nl_pid;
- dst_group = ffs(addr->nl_groups);
-- if (dst_group && !netlink_capable(sock, NL_NONROOT_SEND))
-- return -EPERM;
-+ if (dst_group && !netlink_capable(sock, NL_NONROOT_SEND)) {
-+ err = -EPERM;
-+ goto out;
-+ }
- } else {
- dst_pid = nlk->dst_pid;
- dst_group = nlk->dst_group;
-@@ -1387,6 +1391,8 @@
- err = netlink_unicast(sk, skb, dst_pid, msg->msg_flags&MSG_DONTWAIT);
-
- out:
-+ scm_destroy(siocb->scm);
-+ siocb->scm = NULL;
- return err;
- }
-
-From c4ff4b829ef9e6353c0b133b7adb564a68054979 Mon Sep 17 00:00:00 2001
-From: Rajiv Andrade <srajiv at linux.vnet.ibm.com>
-Date: Fri, 12 Nov 2010 22:30:02 +0100
-Subject: TPM: Long default timeout fix
-
-From: Rajiv Andrade <srajiv at linux.vnet.ibm.com>
-
-commit c4ff4b829ef9e6353c0b133b7adb564a68054979 upstream.
-
-If duration variable value is 0 at this point, it's because
-chip->vendor.duration wasn't filled by tpm_get_timeouts() yet.
-This patch sets then the lowest timeout just to give enough
-time for tpm_get_timeouts() to further succeed.
-
-This fix avoids long boot times in case another entity attempts
-to send commands to the TPM when the TPM isn't accessible.
-
-Signed-off-by: Rajiv Andrade <srajiv at linux.vnet.ibm.com>
-Signed-off-by: James Morris <jmorris at namei.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-Signed-off-by: Andi Kleen <ak at linux.intel.com>
-
----
- drivers/char/tpm/tpm.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-Index: linux-2.6.35.y/drivers/char/tpm/tpm.c
-===================================================================
---- linux-2.6.35.y.orig/drivers/char/tpm/tpm.c 2011-03-29 22:51:41.259667437 -0700
-+++ linux-2.6.35.y/drivers/char/tpm/tpm.c 2011-03-29 23:55:12.337151500 -0700
-@@ -354,12 +354,14 @@
- tpm_protected_ordinal_duration[ordinal &
- TPM_PROTECTED_ORDINAL_MASK];
-
-- if (duration_idx != TPM_UNDEFINED)
-+ if (duration_idx != TPM_UNDEFINED) {
- duration = chip->vendor.duration[duration_idx];
-- if (duration <= 0)
-+ /* if duration is 0, it's because chip->vendor.duration wasn't */
-+ /* filled yet, so we set the lowest timeout just to give enough */
-+ /* time for tpm_get_timeouts() to succeed */
-+ return (duration <= 0 ? HZ : duration);
-+ } else
- return 2 * 60 * HZ;
-- else
-- return duration;
- }
- EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);
-
-From 9b29050f8f75916f974a2d231ae5d3cd59792296 Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb at linux.vnet.ibm.com>
-Date: Tue, 11 Jan 2011 14:37:29 -0500
-Subject: tpm_tis: Use timeouts returned from TPM
-
-From: Stefan Berger <stefanb at linux.vnet.ibm.com>
-
-commit 9b29050f8f75916f974a2d231ae5d3cd59792296 upstream.
-
-The current TPM TIS driver in git discards the timeout values returned
-from the TPM. The check of the response packet needs to consider that
-the return_code field is 0 on success and the size of the expected
-packet is equivalent to the header size + u32 length indicator for the
-TPM_GetCapability() result + 3 timeout indicators of type u32.
-
-I am also adding a sysfs entry 'timeouts' showing the timeouts that are
-being used.
-
-Signed-off-by: Stefan Berger <stefanb at linux.vnet.ibm.com>
-Signed-off-by: Andi Kleen <ak at linux.intel.com>
-Tested-by: Guillaume Chazarain <guichaz at gmail.com>
-Signed-off-by: Rajiv Andrade <srajiv at linux.vnet.ibm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/char/tpm/tpm.c | 18 ++++++++++++++++--
- drivers/char/tpm/tpm.h | 2 ++
- drivers/char/tpm/tpm_tis.c | 4 +++-
- 3 files changed, 21 insertions(+), 3 deletions(-)
-
-Index: linux-2.6.35.y/drivers/char/tpm/tpm.c
-===================================================================
---- linux-2.6.35.y.orig/drivers/char/tpm/tpm.c 2011-03-29 23:02:59.667308683 -0700
-+++ linux-2.6.35.y/drivers/char/tpm/tpm.c 2011-03-29 23:02:59.685308223 -0700
-@@ -567,9 +567,11 @@
- if (rc)
- return;
-
-- if (be32_to_cpu(tpm_cmd.header.out.return_code)
-- != 3 * sizeof(u32))
-+ if (be32_to_cpu(tpm_cmd.header.out.return_code) != 0 ||
-+ be32_to_cpu(tpm_cmd.header.out.length)
-+ != sizeof(tpm_cmd.header.out) + sizeof(u32) + 3 * sizeof(u32))
- return;
-+
- duration_cap = &tpm_cmd.params.getcap_out.cap.duration;
- chip->vendor.duration[TPM_SHORT] =
- usecs_to_jiffies(be32_to_cpu(duration_cap->tpm_short));
-@@ -913,6 +915,18 @@
- }
- EXPORT_SYMBOL_GPL(tpm_show_caps_1_2);
-
-+ssize_t tpm_show_timeouts(struct device *dev, struct device_attribute *attr,
-+ char *buf)
-+{
-+ struct tpm_chip *chip = dev_get_drvdata(dev);
-+
-+ return sprintf(buf, "%d %d %d\n",
-+ jiffies_to_usecs(chip->vendor.duration[TPM_SHORT]),
-+ jiffies_to_usecs(chip->vendor.duration[TPM_MEDIUM]),
-+ jiffies_to_usecs(chip->vendor.duration[TPM_LONG]));
-+}
-+EXPORT_SYMBOL_GPL(tpm_show_timeouts);
-+
- ssize_t tpm_store_cancel(struct device *dev, struct device_attribute *attr,
- const char *buf, size_t count)
- {
-Index: linux-2.6.35.y/drivers/char/tpm/tpm.h
-===================================================================
---- linux-2.6.35.y.orig/drivers/char/tpm/tpm.h 2011-03-29 22:51:40.876677237 -0700
-+++ linux-2.6.35.y/drivers/char/tpm/tpm.h 2011-03-29 23:02:59.685308223 -0700
-@@ -56,6 +56,8 @@
- char *);
- extern ssize_t tpm_show_temp_deactivated(struct device *,
- struct device_attribute *attr, char *);
-+extern ssize_t tpm_show_timeouts(struct device *,
-+ struct device_attribute *attr, char *);
-
- struct tpm_chip;
-
-Index: linux-2.6.35.y/drivers/char/tpm/tpm_tis.c
-===================================================================
---- linux-2.6.35.y.orig/drivers/char/tpm/tpm_tis.c 2011-03-29 22:51:40.877677211 -0700
-+++ linux-2.6.35.y/drivers/char/tpm/tpm_tis.c 2011-03-29 23:02:59.686308198 -0700
-@@ -355,6 +355,7 @@
- NULL);
- static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps_1_2, NULL);
- static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel);
-+static DEVICE_ATTR(timeouts, S_IRUGO, tpm_show_timeouts, NULL);
-
- static struct attribute *tis_attrs[] = {
- &dev_attr_pubek.attr,
-@@ -364,7 +365,8 @@
- &dev_attr_owned.attr,
- &dev_attr_temp_deactivated.attr,
- &dev_attr_caps.attr,
-- &dev_attr_cancel.attr, NULL,
-+ &dev_attr_cancel.attr,
-+ &dev_attr_timeouts.attr, NULL,
- };
-
- static struct attribute_group tis_attr_grp = {
From c6c14330717f9850b4b4c054b81424b9979cd07d Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf at free.fr>
Date: Tue, 14 Dec 2010 16:15:37 -0300
diff --git a/sources b/sources
index 3cdf638..87a67d5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
-c835a799c89c296b332077a5390fcc68 patch-2.6.35.12.bz2
+017e8564c850d950b91bb4ce94974c07 patch-2.6.35.13.bz2
More information about the scm-commits
mailing list