[kernel/stabilization] Linux v3.12.3

Justin M. Forbes jforbes at fedoraproject.org
Wed Dec 4 22:07:36 UTC 2013


commit 9263f3b4e778b6001a5f70641214a9c760c0876a
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Wed Dec 4 16:07:29 2013 -0600

    Linux v3.12.3

 ...l-back-to-vmalloc-for-client-event-buffer.patch |   67 ----------------
 drm-qxl-backport-fixes-for-Fedora.patch            |   13 ---
 ...-fix-memory-leak-in-release-list-handling.patch |   30 -------
 kernel.spec                                        |   19 +----
 keys-x509-improv.patch                             |   81 --------------------
 ...ev-flags-more-safely-in-md_check_recovery.patch |   43 ----------
 sources                                            |    2 +-
 7 files changed, 6 insertions(+), 249 deletions(-)
---
diff --git a/drm-qxl-backport-fixes-for-Fedora.patch b/drm-qxl-backport-fixes-for-Fedora.patch
index c46060d..04848b5 100644
--- a/drm-qxl-backport-fixes-for-Fedora.patch
+++ b/drm-qxl-backport-fixes-for-Fedora.patch
@@ -150,19 +150,6 @@ index 7e96f4f..18c599d 100644
  };
  
  /* forward declaration for QXL_INFO_IO */
-diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
-index 88722f2..f437b30 100644
---- a/drivers/gpu/drm/qxl/qxl_fb.c
-+++ b/drivers/gpu/drm/qxl/qxl_fb.c
-@@ -108,7 +108,7 @@ static void qxl_fb_dirty_flush(struct fb_info *info)
- 	u32 x1, x2, y1, y2;
- 
- 	/* TODO: hard coding 32 bpp */
--	int stride = qfbdev->qfb.base.pitches[0] * 4;
-+	int stride = qfbdev->qfb.base.pitches[0];
- 
- 	x1 = qfbdev->dirty.x1;
- 	x2 = qfbdev->dirty.x2;
 diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c
 index 9e8da9e..e0ddd5b 100644
 --- a/drivers/gpu/drm/qxl/qxl_kms.c
diff --git a/kernel.spec b/kernel.spec
index 53d11b9..5d08f55 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 3
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -74,7 +74,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -734,9 +734,6 @@ Patch25128: dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
 Patch25129: cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch
 
 Patch25140: drm-qxl-backport-fixes-for-Fedora.patch
-Patch25160: drm-qxl-fix-memory-leak-in-release-list-handling.patch
-
-Patch25141: Input-evdev-fall-back-to-vmalloc-for-client-event-buffer.patch
 
 #CVE-2013-4563 rhbz 1030015 1030017
 Patch25145: ipv6-fix-headroom-calculation-in-udp6_ufo_fragment.patch
@@ -769,9 +766,6 @@ Patch25159: usbnet-fix-status-interrupt-urb-handling.patch
 Patch25161: inet-prevent-leakage-of-uninitialized-memory-to-user.patch
 Patch25162: inet-fix-addr_len-msg_namelen-assignment-in-recv_error-and-rxpmtu-functions.patch
 
-#rhbz 1033971
-Patch25163: md-test-mddev-flags-more-safely-in-md_check_recovery.patch
-
 #rhbz 958826
 Patch25164: dell-laptop.patch
 
@@ -1473,9 +1467,6 @@ ApplyPatch dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
 ApplyPatch cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch
 
 ApplyPatch drm-qxl-backport-fixes-for-Fedora.patch
-ApplyPatch drm-qxl-fix-memory-leak-in-release-list-handling.patch
-
-ApplyPatch Input-evdev-fall-back-to-vmalloc-for-client-event-buffer.patch
 
 #CVE-2013-4563 rhbz 1030015 1030017
 ApplyPatch ipv6-fix-headroom-calculation-in-udp6_ufo_fragment.patch
@@ -1508,9 +1499,6 @@ ApplyPatch usbnet-fix-status-interrupt-urb-handling.patch
 ApplyPatch inet-prevent-leakage-of-uninitialized-memory-to-user.patch
 ApplyPatch inet-fix-addr_len-msg_namelen-assignment-in-recv_error-and-rxpmtu-functions.patch
 
-#rhbz 1033971
-ApplyPatch md-test-mddev-flags-more-safely-in-md_check_recovery.patch
-
 #rhbz 958826
 ApplyPatch dell-laptop.patch
 
@@ -2317,6 +2305,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Dec 04 2013 Justin M. Forbes <jforbes at fedoraproject.org> - 3.12.3-1
+- Linux v3.12.3
+
 * Tue Dec  3 2013 Peter Robinson <pbrobinson at fedoraproject.org>
 - Minor ARM cleanups and remove obsolete options
 
diff --git a/keys-x509-improv.patch b/keys-x509-improv.patch
index 7176cc5..db07ea3 100644
--- a/keys-x509-improv.patch
+++ b/keys-x509-improv.patch
@@ -852,87 +852,6 @@ index eb368d4..0f55e3b 100644
 1.8.3.1
 
 
-From 4d729ace6be1c3b2b5d9b0d0301a4ffd342ec74a Mon Sep 17 00:00:00 2001
-From: David Howells <dhowells at redhat.com>
-Date: Tue, 18 Jun 2013 17:40:44 +0100
-Subject: [PATCH 10/18] X.509: Remove certificate date checks
-
-Remove the certificate date checks that are performed when a certificate is
-parsed.  There are two checks: a valid from and a valid to.  The first check is
-causing a lot of problems with system clocks that don't keep good time and the
-second places an implicit expiry date upon the kernel when used for module
-signing, so do we really need them?
-
-Signed-off-by: David Howells <dhowells at redhat.com>
-cc: David Woodhouse <dwmw2 at infradead.org>
-cc: Rusty Russell <rusty at rustcorp.com.au>
-cc: Josh Boyer <jwboyer at redhat.com>
-cc: Alexander Holler <holler at ahsoftware.de>
-cc: stable at vger.kernel.org
----
- crypto/asymmetric_keys/x509_public_key.c | 38 --------------------------------
- 1 file changed, 38 deletions(-)
-
-diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c
-index 0f55e3b..c1540e8 100644
---- a/crypto/asymmetric_keys/x509_public_key.c
-+++ b/crypto/asymmetric_keys/x509_public_key.c
-@@ -108,7 +108,6 @@ EXPORT_SYMBOL_GPL(x509_check_signature);
- static int x509_key_preparse(struct key_preparsed_payload *prep)
- {
- 	struct x509_certificate *cert;
--	struct tm now;
- 	size_t srlen, sulen;
- 	char *desc = NULL;
- 	int ret;
-@@ -150,43 +149,6 @@ static int x509_key_preparse(struct key_preparsed_payload *prep)
- 		goto error_free_cert;
- 	}
- 
--	time_to_tm(CURRENT_TIME.tv_sec, 0, &now);
--	pr_devel("Now: %04ld-%02d-%02d %02d:%02d:%02d\n",
--		 now.tm_year + 1900, now.tm_mon + 1, now.tm_mday,
--		 now.tm_hour, now.tm_min,  now.tm_sec);
--	if (now.tm_year < cert->valid_from.tm_year ||
--	    (now.tm_year == cert->valid_from.tm_year &&
--	     (now.tm_mon < cert->valid_from.tm_mon ||
--	      (now.tm_mon == cert->valid_from.tm_mon &&
--	       (now.tm_mday < cert->valid_from.tm_mday ||
--		(now.tm_mday == cert->valid_from.tm_mday &&
--		 (now.tm_hour < cert->valid_from.tm_hour ||
--		  (now.tm_hour == cert->valid_from.tm_hour &&
--		   (now.tm_min < cert->valid_from.tm_min ||
--		    (now.tm_min == cert->valid_from.tm_min &&
--		     (now.tm_sec < cert->valid_from.tm_sec
--		      ))))))))))) {
--		pr_warn("Cert %s is not yet valid\n", cert->fingerprint);
--		ret = -EKEYREJECTED;
--		goto error_free_cert;
--	}
--	if (now.tm_year > cert->valid_to.tm_year ||
--	    (now.tm_year == cert->valid_to.tm_year &&
--	     (now.tm_mon > cert->valid_to.tm_mon ||
--	      (now.tm_mon == cert->valid_to.tm_mon &&
--	       (now.tm_mday > cert->valid_to.tm_mday ||
--		(now.tm_mday == cert->valid_to.tm_mday &&
--		 (now.tm_hour > cert->valid_to.tm_hour ||
--		  (now.tm_hour == cert->valid_to.tm_hour &&
--		   (now.tm_min > cert->valid_to.tm_min ||
--		    (now.tm_min == cert->valid_to.tm_min &&
--		     (now.tm_sec > cert->valid_to.tm_sec
--		      ))))))))))) {
--		pr_warn("Cert %s has expired\n", cert->fingerprint);
--		ret = -EKEYEXPIRED;
--		goto error_free_cert;
--	}
--
- 	cert->pub->algo = pkey_algo[cert->pub->pkey_algo];
- 	cert->pub->id_type = PKEY_ID_X509;
- 
--- 
-1.8.3.1
-
-
 From 33f859fea67ab5307da4049e947fbc23cdd13a27 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells at redhat.com>
 Date: Fri, 30 Aug 2013 16:07:13 +0100
diff --git a/sources b/sources
index 8988261..dfd21ab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 cc6ee608854e0da4b64f6c1ff8b6398c  linux-3.12.tar.xz
-97453b56d6a999b5a4b0899b4e28fabe  patch-3.12.2.xz
+b7a603bf67e69936cf049fc6b37d9085  patch-3.12.3.xz


More information about the scm-commits mailing list