From: Greg Kroah-Hartman Date: Tue, 11 Nov 2008 21:02:56 +0000 (-0800) Subject: remove hwmon-applesmc patches and add another one for .27 X-Git-Tag: v2.6.27.6~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11fafcc17a44bf6f009a70cb4c61c88b95587637;p=thirdparty%2Fkernel%2Fstable-queue.git remove hwmon-applesmc patches and add another one for .27 --- diff --git a/queue-2.6.27/hwmon-applesmc-add-support-for-imac-5.patch b/queue-2.6.27/hwmon-applesmc-add-support-for-imac-5.patch deleted file mode 100644 index 10fa542a687..00000000000 --- a/queue-2.6.27/hwmon-applesmc-add-support-for-imac-5.patch +++ /dev/null @@ -1,55 +0,0 @@ -From linux-kernel@vger.kernel.org Tue Nov 11 10:19:48 2008 -From: Henrik Rydberg -Date: Thu, 6 Nov 2008 23:59:14 GMT -Subject: hwmon: applesmc: add support for iMac 5 -Message-ID: <200811062359.mA6NxE4M025336@hera.kernel.org> - -From: Henrik Rydberg - -Commit 6e3530fa241ae759313496f67295c9252691ed04 upstream - -hwmon: applesmc: add support for iMac 5 - -Add temperature sensor support for iMac 5. - -Signed-off-by: Henrik Rydberg -Tested-by: Ricky Campbell -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwmon/applesmc.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -113,6 +113,8 @@ static const char* temperature_sensors_s - /* Set 9: Macbook Pro 3,1 (Santa Rosa) */ - { "TALP", "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", - "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, -+/* Set 10: iMac 5,1 */ -+ { "TA0P", "TC0D", "TC0P", "TG0D", "TH0P", "TO0P", "Tm0P", NULL }, - }; - - /* List of keys used to read/write fan speeds */ -@@ -1248,6 +1250,8 @@ static __initdata struct dmi_match_data - { .accelerometer = 1, .light = 1, .temperature_set = 8 }, - /* MacBook Pro 3: accelerometer, backlight and temperature set 9 */ - { .accelerometer = 1, .light = 1, .temperature_set = 9 }, -+/* iMac 5: light sensor only, temperature set 10 */ -+ { .accelerometer = 0, .light = 0, .temperature_set = 10 }, - }; - - /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". -@@ -1289,6 +1293,10 @@ static __initdata struct dmi_system_id a - DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), - DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") }, - (void*)&applesmc_dmi_data[4]}, -+ { applesmc_dmi_match, "Apple iMac 5", { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") }, -+ &applesmc_dmi_data[10]}, - { applesmc_dmi_match, "Apple iMac", { - DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), - DMI_MATCH(DMI_PRODUCT_NAME,"iMac") }, diff --git a/queue-2.6.27/hwmon-applesmc-add-support-for-imac-8.patch b/queue-2.6.27/hwmon-applesmc-add-support-for-imac-8.patch deleted file mode 100644 index 1bcdc9a40ff..00000000000 --- a/queue-2.6.27/hwmon-applesmc-add-support-for-imac-8.patch +++ /dev/null @@ -1,56 +0,0 @@ -From linux-kernel@vger.kernel.org Tue Nov 11 10:21:34 2008 -From: Henrik Rydberg -Date: Thu, 6 Nov 2008 23:59:20 GMT -Subject: hwmon: applesmc: add support for iMac 8 -Message-ID: <200811062359.mA6NxK7H025435@hera.kernel.org> - -From: Henrik Rydberg - -Commit eefc488f96cdde6e152b45675b50bf380b95d99f upstream - -hwmon: applesmc: add support for iMac 8 - -Add temperature sensor support for iMac 8. - -Signed-off-by: Henrik Rydberg -Tested-by: Klaus Doblmann -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwmon/applesmc.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -122,6 +122,9 @@ static const char* temperature_sensors_s - { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D", - "TG0F", "TG0H", "TG0P", "TG0T", "TG1H", "TN0D", "TN0P", "TTF0", - "Th2H", "Tm0P", "Ts0P", "Ts0S", NULL }, -+/* Set 13: iMac 8,1 */ -+ { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P", -+ "TL0P", "TO0P", "TW0P", "Tm0P", "Tp0P", NULL }, - }; - - /* List of keys used to read/write fan speeds */ -@@ -1263,6 +1266,8 @@ static __initdata struct dmi_match_data - { .accelerometer = 1, .light = 1, .temperature_set = 11 }, - /* MacBook Pro 5: accelerometer, backlight and temperature set 12 */ - { .accelerometer = 1, .light = 1, .temperature_set = 12 }, -+/* iMac 8: light sensor only, temperature set 13 */ -+ { .accelerometer = 0, .light = 0, .temperature_set = 13 }, - }; - - /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". -@@ -1312,6 +1317,10 @@ static __initdata struct dmi_system_id a - DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), - DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") }, - (void*)&applesmc_dmi_data[4]}, -+ { applesmc_dmi_match, "Apple iMac 8", { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "iMac8") }, -+ &applesmc_dmi_data[13]}, - { applesmc_dmi_match, "Apple iMac 5", { - DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), - DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") }, diff --git a/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-5.patch b/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-5.patch deleted file mode 100644 index 4ed5c3e7b6f..00000000000 --- a/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-5.patch +++ /dev/null @@ -1,57 +0,0 @@ -From linux-kernel@vger.kernel.org Tue Nov 11 10:19:06 2008 -From: Henrik Rydberg -Date: Thu, 6 Nov 2008 23:59:16 GMT -Subject: hwmon: applesmc: add support for Macbook 5 -Message-ID: <200811062359.mA6NxGPp025363@hera.kernel.org> - -From: Henrik Rydberg - -Commit 181209a1d91756bfd83b1d6ce2008cea3ca225b6 upstream - -hwmon: applesmc: add support for Macbook 5 - -Add accelerometer, backlight and temperature sensor support for the new -unibody Macbook 5. - -Signed-off-by: Henrik Rydberg -Tested-by: David M. Lary -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwmon/applesmc.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -115,6 +115,9 @@ static const char* temperature_sensors_s - "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, - /* Set 10: iMac 5,1 */ - { "TA0P", "TC0D", "TC0P", "TG0D", "TH0P", "TO0P", "Tm0P", NULL }, -+/* Set 11: Macbook 5,1 */ -+ { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0P", "TN0D", "TN0P", -+ "TTF0", "Th0H", "Th1H", "ThFH", "Ts0P", "Ts0S", NULL }, - }; - - /* List of keys used to read/write fan speeds */ -@@ -1252,6 +1255,8 @@ static __initdata struct dmi_match_data - { .accelerometer = 1, .light = 1, .temperature_set = 9 }, - /* iMac 5: light sensor only, temperature set 10 */ - { .accelerometer = 0, .light = 0, .temperature_set = 10 }, -+/* MacBook 5: accelerometer, backlight and temperature set 11 */ -+ { .accelerometer = 1, .light = 1, .temperature_set = 11 }, - }; - - /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". -@@ -1281,6 +1286,10 @@ static __initdata struct dmi_system_id a - DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), - DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") }, - (void*)&applesmc_dmi_data[6]}, -+ { applesmc_dmi_match, "Apple MacBook 5", { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5") }, -+ &applesmc_dmi_data[11]}, - { applesmc_dmi_match, "Apple MacBook", { - DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), - DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") }, diff --git a/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-air.patch b/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-air.patch deleted file mode 100644 index 2ed4eee7127..00000000000 --- a/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-air.patch +++ /dev/null @@ -1,55 +0,0 @@ -From f5274c972bac2d14c092a9c634e03f51785c7b76 Mon Sep 17 00:00:00 2001 -From: Henrik Rydberg -Date: Sat, 18 Oct 2008 20:27:40 -0700 -Subject: hwmon: applesmc: add support for Macbook Air - -From: Henrik Rydberg - -commit f5274c972bac2d14c092a9c634e03f51785c7b76 upstream - -This patch adds accelerometer, backlight and temperature sensor support -for the Macbook Air. - -Signed-off-by: Henrik Rydberg -Cc: Nicolas Boichat -Cc: Riki Oktarianto -Cc: Mark M. Hoffman -Cc: Jean Delvare -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwmon/applesmc.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -104,6 +104,9 @@ static const char* temperature_sensors_s - /* Set 6: Macbook3 set */ - { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TTF0", "TW0P", "Th0H", - "Th0S", "Th1H", NULL }, -+/* Set 7: Macbook Air */ -+ { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TC0P", "TCFP", -+ "TTF0", "TW0P", "Th0H", "Tp0P", "TpFP", "Ts0P", "Ts0S", NULL }, - }; - - /* List of keys used to read/write fan speeds */ -@@ -1233,11 +1236,17 @@ static __initdata struct dmi_match_data - { .accelerometer = 0, .light = 0, .temperature_set = 5 }, - /* MacBook3: accelerometer and temperature set 6 */ - { .accelerometer = 1, .light = 0, .temperature_set = 6 }, -+/* MacBook Air: accelerometer, backlight and temperature set 7 */ -+ { .accelerometer = 1, .light = 1, .temperature_set = 7 }, - }; - - /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". - * So we need to put "Apple MacBook Pro" before "Apple MacBook". */ - static __initdata struct dmi_system_id applesmc_whitelist[] = { -+ { applesmc_dmi_match, "Apple MacBook Air", { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, -+ (void*)&applesmc_dmi_data[7]}, - { applesmc_dmi_match, "Apple MacBook Pro", { - DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), - DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") }, diff --git a/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-pro-3.patch b/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-pro-3.patch deleted file mode 100644 index 9b30cd8b240..00000000000 --- a/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-pro-3.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 07e8dbd3ebbdedc71335049dd4b0d542cb038d7d Mon Sep 17 00:00:00 2001 -From: Henrik Rydberg -Date: Sat, 18 Oct 2008 20:27:42 -0700 -Subject: hwmon: applesmc: Add support for Macbook Pro 3 - -From: Henrik Rydberg - -commit 07e8dbd3ebbdedc71335049dd4b0d542cb038d7d upstream - -Add temperature sensor support for Macbook Pro 3. - -Signed-off-by: Henrik Rydberg -Cc: Nicolas Boichat -Cc: Riki Oktarianto -Cc: Mark M. Hoffman -Cc: Jean Delvare -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwmon/applesmc.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -110,6 +110,9 @@ static const char* temperature_sensors_s - /* Set 8: Macbook Pro 4,1 (Penryn) */ - { "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", "Th0H", - "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, -+/* Set 9: Macbook Pro 3,1 (Santa Rosa) */ -+ { "TALP", "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", -+ "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, - }; - - /* List of keys used to read/write fan speeds */ -@@ -1243,6 +1246,8 @@ static __initdata struct dmi_match_data - { .accelerometer = 1, .light = 1, .temperature_set = 7 }, - /* MacBook Pro 4: accelerometer, backlight and temperature set 8 */ - { .accelerometer = 1, .light = 1, .temperature_set = 8 }, -+/* MacBook Pro 3: accelerometer, backlight and temperature set 9 */ -+ { .accelerometer = 1, .light = 1, .temperature_set = 9 }, - }; - - /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". -@@ -1256,6 +1261,10 @@ static __initdata struct dmi_system_id a - DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), - DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") }, - &applesmc_dmi_data[8]}, -+ { applesmc_dmi_match, "Apple MacBook Pro 3", { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3") }, -+ &applesmc_dmi_data[9]}, - { applesmc_dmi_match, "Apple MacBook Pro", { - DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), - DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") }, diff --git a/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-pro-4.patch b/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-pro-4.patch deleted file mode 100644 index 7e2cd6cd1cb..00000000000 --- a/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-pro-4.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d7549905f157f217b888edb0f2055f5090eaf1d8 Mon Sep 17 00:00:00 2001 -From: Henrik Rydberg -Date: Sat, 18 Oct 2008 20:27:41 -0700 -Subject: hwmon: applesmc: Add support for Macbook Pro 4 - -From: Henrik Rydberg - -commit d7549905f157f217b888edb0f2055f5090eaf1d8 upstream - -Adds temperature sensor support for the Macbook Pro 4. - -Signed-off-by: Henrik Rydberg -Cc: Nicolas Boichat -Cc: Riki Oktarianto -Cc: Mark M. Hoffman -Cc: Jean Delvare -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwmon/applesmc.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -107,6 +107,9 @@ static const char* temperature_sensors_s - /* Set 7: Macbook Air */ - { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TC0P", "TCFP", - "TTF0", "TW0P", "Th0H", "Tp0P", "TpFP", "Ts0P", "Ts0S", NULL }, -+/* Set 8: Macbook Pro 4,1 (Penryn) */ -+ { "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", "Th0H", -+ "Th1H", "Th2H", "Tm0P", "Ts0P", NULL }, - }; - - /* List of keys used to read/write fan speeds */ -@@ -1238,6 +1241,8 @@ static __initdata struct dmi_match_data - { .accelerometer = 1, .light = 0, .temperature_set = 6 }, - /* MacBook Air: accelerometer, backlight and temperature set 7 */ - { .accelerometer = 1, .light = 1, .temperature_set = 7 }, -+/* MacBook Pro 4: accelerometer, backlight and temperature set 8 */ -+ { .accelerometer = 1, .light = 1, .temperature_set = 8 }, - }; - - /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". -@@ -1247,6 +1252,10 @@ static __initdata struct dmi_system_id a - DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), - DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, - (void*)&applesmc_dmi_data[7]}, -+ { applesmc_dmi_match, "Apple MacBook Pro 4", { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") }, -+ &applesmc_dmi_data[8]}, - { applesmc_dmi_match, "Apple MacBook Pro", { - DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), - DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") }, diff --git a/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-pro-5.patch b/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-pro-5.patch deleted file mode 100644 index 622c5988140..00000000000 --- a/queue-2.6.27/hwmon-applesmc-add-support-for-macbook-pro-5.patch +++ /dev/null @@ -1,57 +0,0 @@ -From linux-kernel@vger.kernel.org Tue Nov 11 10:20:22 2008 -From: Henrik Rydberg -Date: Thu, 6 Nov 2008 23:59:18 GMT -Subject: hwmon: applesmc: add support for Macbook Pro 5 -Message-ID: <200811062359.mA6NxIWN025395@hera.kernel.org> - -From: Henrik Rydberg - -Commit a66603257bf88bbe2c9fd6a97ee5dc24de15d196 upstream - -hwmon: applesmc: add support for Macbook Pro 5 - -Add accelerometer, backlight and temperature sensor support for the new -unibody Macbook Pro 5. - -Signed-off-by: Henrik Rydberg -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hwmon/applesmc.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -118,6 +118,10 @@ static const char* temperature_sensors_s - /* Set 11: Macbook 5,1 */ - { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0P", "TN0D", "TN0P", - "TTF0", "Th0H", "Th1H", "ThFH", "Ts0P", "Ts0S", NULL }, -+/* Set 12: Macbook Pro 5,1 */ -+ { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D", -+ "TG0F", "TG0H", "TG0P", "TG0T", "TG1H", "TN0D", "TN0P", "TTF0", -+ "Th2H", "Tm0P", "Ts0P", "Ts0S", NULL }, - }; - - /* List of keys used to read/write fan speeds */ -@@ -1257,6 +1261,8 @@ static __initdata struct dmi_match_data - { .accelerometer = 0, .light = 0, .temperature_set = 10 }, - /* MacBook 5: accelerometer, backlight and temperature set 11 */ - { .accelerometer = 1, .light = 1, .temperature_set = 11 }, -+/* MacBook Pro 5: accelerometer, backlight and temperature set 12 */ -+ { .accelerometer = 1, .light = 1, .temperature_set = 12 }, - }; - - /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". -@@ -1266,6 +1272,10 @@ static __initdata struct dmi_system_id a - DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), - DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, - (void*)&applesmc_dmi_data[7]}, -+ { applesmc_dmi_match, "Apple MacBook Pro 5", { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") }, -+ &applesmc_dmi_data[12]}, - { applesmc_dmi_match, "Apple MacBook Pro 4", { - DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), - DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") }, diff --git a/queue-2.6.27/keys-make-request-key-instantiate-the-per-user-keyrings.patch b/queue-2.6.27/keys-make-request-key-instantiate-the-per-user-keyrings.patch new file mode 100644 index 00000000000..68bb557f498 --- /dev/null +++ b/queue-2.6.27/keys-make-request-key-instantiate-the-per-user-keyrings.patch @@ -0,0 +1,59 @@ +From 1f8f5cf6e4f038552a3e47b66085452c08556d71 Mon Sep 17 00:00:00 2001 +From: David Howells +Date: Mon, 10 Nov 2008 19:00:05 +0000 +Subject: KEYS: Make request key instantiate the per-user keyrings + +From: David Howells + +commit 1f8f5cf6e4f038552a3e47b66085452c08556d71 upstream + +Make request_key() instantiate the per-user keyrings so that it doesn't oops +if it needs to get hold of the user session keyring because there isn't a +session keyring in place. + +Signed-off-by: David Howells +Tested-by: Steve French +Tested-by: Rutger Nijlunsing +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + security/keys/internal.h | 1 + + security/keys/process_keys.c | 2 +- + security/keys/request_key.c | 4 ++++ + 3 files changed, 6 insertions(+), 1 deletion(-) + +--- a/security/keys/internal.h ++++ b/security/keys/internal.h +@@ -107,6 +107,7 @@ extern key_ref_t search_process_keyrings + + extern struct key *find_keyring_by_name(const char *name, bool skip_perm_check); + ++extern int install_user_keyrings(struct task_struct *tsk); + extern int install_thread_keyring(struct task_struct *tsk); + extern int install_process_keyring(struct task_struct *tsk); + +--- a/security/keys/process_keys.c ++++ b/security/keys/process_keys.c +@@ -40,7 +40,7 @@ struct key_user root_key_user = { + /* + * install user and user session keyrings for a particular UID + */ +-static int install_user_keyrings(struct task_struct *tsk) ++int install_user_keyrings(struct task_struct *tsk) + { + struct user_struct *user = tsk->user; + struct key *uid_keyring, *session_keyring; +--- a/security/keys/request_key.c ++++ b/security/keys/request_key.c +@@ -74,6 +74,10 @@ static int call_sbin_request_key(struct + + kenter("{%d},{%d},%s", key->serial, authkey->serial, op); + ++ ret = install_user_keyrings(tsk); ++ if (ret < 0) ++ goto error_alloc; ++ + /* allocate a new session keyring */ + sprintf(desc, "_req.%u", key->serial); + diff --git a/queue-2.6.27/series b/queue-2.6.27/series index 1baa0c14b15..4f4558354ee 100644 --- a/queue-2.6.27/series +++ b/queue-2.6.27/series @@ -24,13 +24,6 @@ i-oat-fix-channel-resources-free-for-not-allocated-channels.patch i-oat-fix-dma_pin_iovec_pages-error-handling.patch i-oat-fix-async_tx.callback-checking.patch dca-fixup-initialization-dependency.patch -hwmon-applesmc-add-support-for-macbook-air.patch -hwmon-applesmc-add-support-for-macbook-pro-4.patch -hwmon-applesmc-add-support-for-macbook-pro-3.patch -hwmon-applesmc-add-support-for-imac-5.patch -hwmon-applesmc-add-support-for-macbook-5.patch -hwmon-applesmc-add-support-for-macbook-pro-5.patch -hwmon-applesmc-add-support-for-imac-8.patch iwlwifi-allow-consecutive-scans-in-unassociated-state.patch iwlwifi-allow-association-on-radar-channel-in-power-save.patch iwlwifi-remove-ht-flags-from-rxon-when-not-in-ht-anymore.patch @@ -44,3 +37,4 @@ iwl3945-do-not-send-scan-command-if-channel-count-zero.patch cpqarry-fix-return-value-of-cpqarray_init.patch acpi-dock-avoid-check-_sta-method.patch arm-5300-1-fixup-spitz-reset-during-boot.patch +keys-make-request-key-instantiate-the-per-user-keyrings.patch