From 755df4e98744f0dee254e7e1f6f87d814cbe09a2 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Jul 12 2012 20:50:43 +0000 Subject: Add patch to fix ACPICA null pointer exception regression (rhbz 834318) --- diff --git a/ACPICA-Fix-possible-fault-in-return-package-object-repair-code.patch b/ACPICA-Fix-possible-fault-in-return-package-object-repair-code.patch new file mode 100644 index 0000000..c8956b8 --- /dev/null +++ b/ACPICA-Fix-possible-fault-in-return-package-object-repair-code.patch @@ -0,0 +1,44 @@ +From: Bob Moore + +Fixes a problem that can occur when a lone package object is +wrapped with an outer package object in order to conform to +the ACPI specification. Can affect these predefined names: +_ALR,_MLS,_PSS,_TRT,_TSS,_PRT,_HPX,_DLM,_CSD,_PSD,_TSD + +https://bugzilla.kernel.org/show_bug.cgi?id=44171 + +Reported-by: Vlastimil Babka +Signed-off-by: Bob Moore +Signed-off-by: Lin Ming +--- + +Len, + +This is an important bug fix. +Could you merge it? + + drivers/acpi/acpica/nspredef.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c +index 23ce096..fe66260 100644 +--- a/drivers/acpi/acpica/nspredef.c ++++ b/drivers/acpi/acpica/nspredef.c +@@ -638,7 +638,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data, + /* Create the new outer package and populate it */ + + status = +- acpi_ns_wrap_with_package(data, *elements, ++ acpi_ns_wrap_with_package(data, return_object, + return_object_ptr); + if (ACPI_FAILURE(status)) { + return (status); +-- +1.7.2.5 + + + +-- +To unsubscribe from this list: send the line "unsubscribe linux-acpi" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html \ No newline at end of file diff --git a/kernel.spec b/kernel.spec index 7f5261b..53a26c5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,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 6 +%global baserelease 7 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -827,6 +827,9 @@ Patch22051: xen-blkback-Copy-id-field-when-doing-BLKIF_DISCARD.patch Patch22055: crypto-testmgr-allow-aesni-intel-and-ghash_clmulni-intel.patch Patch22056: crypto-aesni-intel-fix-wrong-kfree-pointer.patch +#rhbz 834318 +Patch22057: ACPICA-Fix-possible-fault-in-return-package-object-repair-code.patch + # END OF PATCH DEFINITIONS %endif @@ -1592,6 +1595,9 @@ ApplyPatch xen-blkback-Copy-id-field-when-doing-BLKIF_DISCARD.patch ApplyPatch crypto-testmgr-allow-aesni-intel-and-ghash_clmulni-intel.patch ApplyPatch crypto-aesni-intel-fix-wrong-kfree-pointer.patch +#rhbz 834318 +ApplyPatch ACPICA-Fix-possible-fault-in-return-package-object-repair-code.patch + # END OF PATCH APPLICATIONS %endif @@ -2452,6 +2458,9 @@ fi # '-' | | # '-' %changelog +* Thu Jul 12 2012 Josh Boyer +- Add patch to fix ACPICA null pointer exception regression (rhbz 834318) + * Wed Jul 11 2012 Justin M. Forbes - Fix FIPS for aesni hardware (rhbz 839239)