From 8681c58b5a8f82e5bb5f56da3a9183109485e708 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 15 Jun 2020 16:38:44 +0200 Subject: [PATCH] 4.4-stable patches added patches: efi-efivars-add-missing-kobject_put-in-sysfs-entry-creation-error-path.patch x86-reboot-quirks-add-macbook6-1-reboot-quirk.patch --- ...t-in-sysfs-entry-creation-error-path.patch | 39 +++++++++++++++++++ queue-4.4/series | 2 + ...t-quirks-add-macbook6-1-reboot-quirk.patch | 39 +++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 queue-4.4/efi-efivars-add-missing-kobject_put-in-sysfs-entry-creation-error-path.patch create mode 100644 queue-4.4/x86-reboot-quirks-add-macbook6-1-reboot-quirk.patch diff --git a/queue-4.4/efi-efivars-add-missing-kobject_put-in-sysfs-entry-creation-error-path.patch b/queue-4.4/efi-efivars-add-missing-kobject_put-in-sysfs-entry-creation-error-path.patch new file mode 100644 index 00000000000..eb8e92cfedf --- /dev/null +++ b/queue-4.4/efi-efivars-add-missing-kobject_put-in-sysfs-entry-creation-error-path.patch @@ -0,0 +1,39 @@ +From d8bd8c6e2cfab8b78b537715255be8d7557791c0 Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Fri, 22 May 2020 18:15:49 +0200 +Subject: efi/efivars: Add missing kobject_put() in sysfs entry creation error path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ard Biesheuvel + +commit d8bd8c6e2cfab8b78b537715255be8d7557791c0 upstream. + +The documentation provided by kobject_init_and_add() clearly spells out +the need to call kobject_put() on the kobject if an error is returned. +Add this missing call to the error path. + +Cc: +Reported-by: 亿一 +Signed-off-by: Ard Biesheuvel +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/firmware/efi/efivars.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/firmware/efi/efivars.c ++++ b/drivers/firmware/efi/efivars.c +@@ -585,8 +585,10 @@ efivar_create_sysfs_entry(struct efivar_ + ret = kobject_init_and_add(&new_var->kobj, &efivar_ktype, + NULL, "%s", short_name); + kfree(short_name); +- if (ret) ++ if (ret) { ++ kobject_put(&new_var->kobj); + return ret; ++ } + + kobject_uevent(&new_var->kobj, KOBJ_ADD); + efivar_entry_add(new_var, &efivar_sysfs_list); diff --git a/queue-4.4/series b/queue-4.4/series index 23b03875b78..6b3c87bf74b 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -9,3 +9,5 @@ sched-fair-don-t-numa-balance-for-kthreads.patch ath9k_htc-silence-undersized-packet-warnings.patch x86_64-fix-jiffies-odr-violation.patch x86-speculation-prevent-rogue-cross-process-ssbd-shutdown.patch +x86-reboot-quirks-add-macbook6-1-reboot-quirk.patch +efi-efivars-add-missing-kobject_put-in-sysfs-entry-creation-error-path.patch diff --git a/queue-4.4/x86-reboot-quirks-add-macbook6-1-reboot-quirk.patch b/queue-4.4/x86-reboot-quirks-add-macbook6-1-reboot-quirk.patch new file mode 100644 index 00000000000..9cc6e0d0bf8 --- /dev/null +++ b/queue-4.4/x86-reboot-quirks-add-macbook6-1-reboot-quirk.patch @@ -0,0 +1,39 @@ +From 140fd4ac78d385e6c8e6a5757585f6c707085f87 Mon Sep 17 00:00:00 2001 +From: Hill Ma +Date: Sat, 25 Apr 2020 13:06:41 -0700 +Subject: x86/reboot/quirks: Add MacBook6,1 reboot quirk + +From: Hill Ma + +commit 140fd4ac78d385e6c8e6a5757585f6c707085f87 upstream. + +On MacBook6,1 reboot would hang unless parameter reboot=pci is added. +Make it automatic. + +Signed-off-by: Hill Ma +Signed-off-by: Borislav Petkov +Cc: stable@vger.kernel.org +Link: https://lkml.kernel.org/r/20200425200641.GA1554@cslab.localdomain +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/reboot.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/arch/x86/kernel/reboot.c ++++ b/arch/x86/kernel/reboot.c +@@ -162,6 +162,14 @@ static struct dmi_system_id __initdata r + DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5"), + }, + }, ++ { /* Handle problems with rebooting on Apple MacBook6,1 */ ++ .callback = set_pci_reboot, ++ .ident = "Apple MacBook6,1", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "MacBook6,1"), ++ }, ++ }, + { /* Handle problems with rebooting on Apple MacBookPro5 */ + .callback = set_pci_reboot, + .ident = "Apple MacBookPro5", -- 2.47.3