From fd639f739a4ad385a3f0cb59e54f63aa2e793355 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 3 Jun 2014 16:09:22 -0700 Subject: [PATCH] 3.4-stable patches added patches: crypto-crypto_wq-fix-late-crypto-work-queue-initialization.patch media-media-device-fix-infoleak-in-ioctl-media_enum_entities.patch --- ...ate-crypto-work-queue-initialization.patch | 36 +++++++++++++++++++ ...nfoleak-in-ioctl-media_enum_entities.patch | 33 +++++++++++++++++ queue-3.4/series | 2 ++ 3 files changed, 71 insertions(+) create mode 100644 queue-3.4/crypto-crypto_wq-fix-late-crypto-work-queue-initialization.patch create mode 100644 queue-3.4/media-media-device-fix-infoleak-in-ioctl-media_enum_entities.patch diff --git a/queue-3.4/crypto-crypto_wq-fix-late-crypto-work-queue-initialization.patch b/queue-3.4/crypto-crypto_wq-fix-late-crypto-work-queue-initialization.patch new file mode 100644 index 00000000000..1f626e6dcc3 --- /dev/null +++ b/queue-3.4/crypto-crypto_wq-fix-late-crypto-work-queue-initialization.patch @@ -0,0 +1,36 @@ +From 130fa5bc81b44b6cc1fbdea3abf6db0da22964e0 Mon Sep 17 00:00:00 2001 +From: Tim Chen +Date: Mon, 17 Mar 2014 16:52:26 -0700 +Subject: crypto: crypto_wq - Fix late crypto work queue initialization + +From: Tim Chen + +commit 130fa5bc81b44b6cc1fbdea3abf6db0da22964e0 upstream. + +The crypto algorithm modules utilizing the crypto daemon could +be used early when the system start up. Using module_init +does not guarantee that the daemon's work queue is initialized +when the cypto alorithm depending on crypto_wq starts. It is necessary +to initialize the crypto work queue earlier at the subsystem +init time to make sure that it is initialized +when used. + +Signed-off-by: Tim Chen +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + crypto/crypto_wq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/crypto/crypto_wq.c ++++ b/crypto/crypto_wq.c +@@ -33,7 +33,7 @@ static void __exit crypto_wq_exit(void) + destroy_workqueue(kcrypto_wq); + } + +-module_init(crypto_wq_init); ++subsys_initcall(crypto_wq_init); + module_exit(crypto_wq_exit); + + MODULE_LICENSE("GPL"); diff --git a/queue-3.4/media-media-device-fix-infoleak-in-ioctl-media_enum_entities.patch b/queue-3.4/media-media-device-fix-infoleak-in-ioctl-media_enum_entities.patch new file mode 100644 index 00000000000..960be266b5f --- /dev/null +++ b/queue-3.4/media-media-device-fix-infoleak-in-ioctl-media_enum_entities.patch @@ -0,0 +1,33 @@ +From e6a623460e5fc960ac3ee9f946d3106233fd28d8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Salva=20Peir=C3=B3?= +Date: Wed, 30 Apr 2014 19:48:02 +0200 +Subject: media: media-device: fix infoleak in ioctl media_enum_entities() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: =?UTF-8?q?Salva=20Peir=C3=B3?= + +commit e6a623460e5fc960ac3ee9f946d3106233fd28d8 upstream. + +This fixes CVE-2014-1739. + +Signed-off-by: Salva Peiró +Acked-by: Laurent Pinchart +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/media/media-device.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/media/media-device.c ++++ b/drivers/media/media-device.c +@@ -90,6 +90,7 @@ static long media_device_enum_entities(s + struct media_entity *ent; + struct media_entity_desc u_ent; + ++ memset(&u_ent, 0, sizeof(u_ent)); + if (copy_from_user(&u_ent.id, &uent->id, sizeof(u_ent.id))) + return -EFAULT; + diff --git a/queue-3.4/series b/queue-3.4/series index 678775341f5..c954f94cb8d 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -59,3 +59,5 @@ arm-8012-1-kdump-avoid-overflow-when-converting-pfn-to-physaddr.patch rtl8192cu-fix-unbalanced-irq-enable-in-error-path-of-rtl92cu_hw_init.patch drm-nouveau-acpi-allow-non-optimus-setups-to-load-vbios-from-acpi.patch documentation-update-stable-address-in-chinese-and-japanese-translations.patch +crypto-crypto_wq-fix-late-crypto-work-queue-initialization.patch +media-media-device-fix-infoleak-in-ioctl-media_enum_entities.patch -- 2.47.3