From: Greg Kroah-Hartman Date: Tue, 3 Jun 2014 23:09:04 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.14.6~60 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8dca2daedcd18a04999a3904b2e9bd2b7f2b307f;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: clk-vexpress-null-dereference-on-error-path.patch crypto-crypto_wq-fix-late-crypto-work-queue-initialization.patch i2c-i801-add-device-ids-for-intel-wildcat-point-lp-pch.patch i2c-i801-enable-intel-baytrail-smbus.patch media-media-device-fix-infoleak-in-ioctl-media_enum_entities.patch --- diff --git a/queue-3.10/clk-vexpress-null-dereference-on-error-path.patch b/queue-3.10/clk-vexpress-null-dereference-on-error-path.patch new file mode 100644 index 00000000000..d772713193b --- /dev/null +++ b/queue-3.10/clk-vexpress-null-dereference-on-error-path.patch @@ -0,0 +1,32 @@ +From 6b4ed8b00e93bd31f24a25f59ed8d1b808d0cc00 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Thu, 7 Nov 2013 08:08:44 +0000 +Subject: clk: vexpress: NULL dereference on error path + +From: Dan Carpenter + +commit 6b4ed8b00e93bd31f24a25f59ed8d1b808d0cc00 upstream. + +If the allocation fails then we dereference the NULL in the error path. +Just return directly. + +Fixes: ed27ff1db869 ('clk: Versatile Express clock generators ("osc") driver') +Signed-off-by: Dan Carpenter +Signed-off-by: Pawel Moll +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/clk/versatile/clk-vexpress-osc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/clk/versatile/clk-vexpress-osc.c ++++ b/drivers/clk/versatile/clk-vexpress-osc.c +@@ -102,7 +102,7 @@ void __init vexpress_osc_of_setup(struct + + osc = kzalloc(sizeof(*osc), GFP_KERNEL); + if (!osc) +- goto error; ++ return; + + osc->func = vexpress_config_func_get_by_node(node); + if (!osc->func) { diff --git a/queue-3.10/crypto-crypto_wq-fix-late-crypto-work-queue-initialization.patch b/queue-3.10/crypto-crypto_wq-fix-late-crypto-work-queue-initialization.patch new file mode 100644 index 00000000000..1f626e6dcc3 --- /dev/null +++ b/queue-3.10/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.10/i2c-i801-add-device-ids-for-intel-wildcat-point-lp-pch.patch b/queue-3.10/i2c-i801-add-device-ids-for-intel-wildcat-point-lp-pch.patch new file mode 100644 index 00000000000..3c7ef40ee35 --- /dev/null +++ b/queue-3.10/i2c-i801-add-device-ids-for-intel-wildcat-point-lp-pch.patch @@ -0,0 +1,68 @@ +From afc659241258b40b683998ec801d25d276529f43 Mon Sep 17 00:00:00 2001 +From: James Ralston +Date: Mon, 4 Nov 2013 09:29:48 -0800 +Subject: i2c: i801: Add Device IDs for Intel Wildcat Point-LP PCH + +From: James Ralston + +commit afc659241258b40b683998ec801d25d276529f43 upstream. + +This patch adds the SMBus Device IDs for the Intel Wildcat Point-LP PCH. + +Signed-off-by: James Ralston +Signed-off-by: Wolfram Sang +Cc: "Chang, Rebecca Swee Fun" +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/i2c/busses/i2c-i801 | 1 + + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-i801.c | 3 +++ + 3 files changed, 5 insertions(+) + +--- a/Documentation/i2c/busses/i2c-i801 ++++ b/Documentation/i2c/busses/i2c-i801 +@@ -25,6 +25,7 @@ Supported adapters: + * Intel Avoton (SOC) + * Intel Wellsburg (PCH) + * Intel Coleto Creek (PCH) ++ * Intel Wildcat Point-LP (PCH) + Datasheets: Publicly available at the Intel website + + On Intel Patsburg and later chipsets, both the normal host SMBus controller +--- a/drivers/i2c/busses/Kconfig ++++ b/drivers/i2c/busses/Kconfig +@@ -109,6 +109,7 @@ config I2C_I801 + Avoton (SOC) + Wellsburg (PCH) + Coleto Creek (PCH) ++ Wildcat Point-LP (PCH) + + This driver can also be built as a module. If so, the module + will be called i2c-i801. +--- a/drivers/i2c/busses/i2c-i801.c ++++ b/drivers/i2c/busses/i2c-i801.c +@@ -59,6 +59,7 @@ + Wellsburg (PCH) MS 0x8d7e 32 hard yes yes yes + Wellsburg (PCH) MS 0x8d7f 32 hard yes yes yes + Coleto Creek (PCH) 0x23b0 32 hard yes yes yes ++ Wildcat Point-LP (PCH) 0x9ca2 32 hard yes yes yes + + Features supported by this driver: + Software PEC no +@@ -178,6 +179,7 @@ + #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS1 0x8d7e + #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2 0x8d7f + #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS 0x9c22 ++#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_SMBUS 0x9ca2 + + struct i801_mux_config { + char *gpio_chip; +@@ -820,6 +822,7 @@ static DEFINE_PCI_DEVICE_TABLE(i801_ids) + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS1) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COLETOCREEK_SMBUS) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_SMBUS) }, + { 0, } + }; + diff --git a/queue-3.10/i2c-i801-enable-intel-baytrail-smbus.patch b/queue-3.10/i2c-i801-enable-intel-baytrail-smbus.patch new file mode 100644 index 00000000000..b11ffa0eabd --- /dev/null +++ b/queue-3.10/i2c-i801-enable-intel-baytrail-smbus.patch @@ -0,0 +1,70 @@ +From 1b31e9b76ef8c62291e698dfdb973499986a7f68 Mon Sep 17 00:00:00 2001 +From: "Chew, Kean ho" +Date: Sat, 1 Mar 2014 00:03:56 +0800 +Subject: i2c: i801: enable Intel BayTrail SMBUS + +From: "Chew, Kean ho" + +commit 1b31e9b76ef8c62291e698dfdb973499986a7f68 upstream. + +Add Device ID of Intel BayTrail SMBus Controller. + +Signed-off-by: Chew, Kean ho +Signed-off-by: Chew, Chiau Ee +Reviewed-by: Jean Delvare +Signed-off-by: Wolfram Sang +Cc: "Chang, Rebecca Swee Fun" +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/i2c/busses/i2c-i801 | 1 + + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-i801.c | 3 +++ + 3 files changed, 5 insertions(+) + +--- a/Documentation/i2c/busses/i2c-i801 ++++ b/Documentation/i2c/busses/i2c-i801 +@@ -26,6 +26,7 @@ Supported adapters: + * Intel Wellsburg (PCH) + * Intel Coleto Creek (PCH) + * Intel Wildcat Point-LP (PCH) ++ * Intel BayTrail (SOC) + Datasheets: Publicly available at the Intel website + + On Intel Patsburg and later chipsets, both the normal host SMBus controller +--- a/drivers/i2c/busses/Kconfig ++++ b/drivers/i2c/busses/Kconfig +@@ -110,6 +110,7 @@ config I2C_I801 + Wellsburg (PCH) + Coleto Creek (PCH) + Wildcat Point-LP (PCH) ++ BayTrail (SOC) + + This driver can also be built as a module. If so, the module + will be called i2c-i801. +--- a/drivers/i2c/busses/i2c-i801.c ++++ b/drivers/i2c/busses/i2c-i801.c +@@ -60,6 +60,7 @@ + Wellsburg (PCH) MS 0x8d7f 32 hard yes yes yes + Coleto Creek (PCH) 0x23b0 32 hard yes yes yes + Wildcat Point-LP (PCH) 0x9ca2 32 hard yes yes yes ++ BayTrail (SOC) 0x0f12 32 hard yes yes yes + + Features supported by this driver: + Software PEC no +@@ -162,6 +163,7 @@ + STATUS_ERROR_FLAGS) + + /* Older devices have their ID defined in */ ++#define PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS 0x0f12 + #define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS 0x1c22 + #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS 0x1d22 + /* Patsburg also has three 'Integrated Device Function' SMBus controllers */ +@@ -823,6 +825,7 @@ static DEFINE_PCI_DEVICE_TABLE(i801_ids) + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COLETOCREEK_SMBUS) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_SMBUS) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS) }, + { 0, } + }; + diff --git a/queue-3.10/media-media-device-fix-infoleak-in-ioctl-media_enum_entities.patch b/queue-3.10/media-media-device-fix-infoleak-in-ioctl-media_enum_entities.patch new file mode 100644 index 00000000000..ce9547f084a --- /dev/null +++ b/queue-3.10/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 +@@ -93,6 +93,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.10/series b/queue-3.10/series index 48aec92781d..6999f3d5882 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -54,3 +54,8 @@ drm-nouveau-pm-fan-drop-the-fan-lock-in-fan_update-before-rescheduling.patch leds-leds-pwm-properly-clean-up-after-probe-failure.patch brcmsmac-fix-deadlock-on-missing-firmware.patch documentation-update-stable-address-in-chinese-and-japanese-translations.patch +crypto-crypto_wq-fix-late-crypto-work-queue-initialization.patch +clk-vexpress-null-dereference-on-error-path.patch +media-media-device-fix-infoleak-in-ioctl-media_enum_entities.patch +i2c-i801-add-device-ids-for-intel-wildcat-point-lp-pch.patch +i2c-i801-enable-intel-baytrail-smbus.patch