Linux 3.4.8
This commit is contained in:
Justin M. Forbes
parent
d1e5565689
commit
cc9d306d06
|
|
@ -1,37 +0,0 @@
|
|||
In the ac.c, lack check return value of power_supply_register().
|
||||
This may casue that acpi driver's add() ops was called successful
|
||||
while the device may be failed to be initalized. For example, some
|
||||
ugly bios may describe two ACADs in the same dsdt. They use the same
|
||||
name which will cause the second ACAD device can no be registered.
|
||||
And then power_supply_register() failed. But acpi driver's add() ops
|
||||
is called sucessfully. The acpi device also will receive acpi notification
|
||||
and cause oops.
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=772730
|
||||
|
||||
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
|
||||
---
|
||||
drivers/acpi/ac.c | 4 +++-
|
||||
1 files changed, 3 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
|
||||
index 6512b20..d1fcbc0 100644
|
||||
--- a/drivers/acpi/ac.c
|
||||
+++ b/drivers/acpi/ac.c
|
||||
@@ -292,7 +292,9 @@ static int acpi_ac_add(struct acpi_device *device)
|
||||
ac->charger.properties = ac_props;
|
||||
ac->charger.num_properties = ARRAY_SIZE(ac_props);
|
||||
ac->charger.get_property = get_ac_property;
|
||||
- power_supply_register(&ac->device->dev, &ac->charger);
|
||||
+ result = power_supply_register(&ac->device->dev, &ac->charger);
|
||||
+ if (result)
|
||||
+ goto end;
|
||||
|
||||
printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
|
||||
acpi_device_name(device), acpi_device_bid(device),
|
||||
--
|
||||
1.7.6.rc2.8.g28eb
|
||||
|
||||
--
|
||||
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
|
||||
|
|
@ -2221,7 +2221,7 @@ index 1ef0c92..9cc1570 100644
|
|||
return 0;
|
||||
msleep(1);
|
||||
}
|
||||
@@ -261,15 +260,16 @@ static void atl1c_check_link_status(struct atl1c_adapter *adapter)
|
||||
@@ -261,14 +260,15 @@ static void atl1c_check_link_status(struct atl1c_adapter *adapter)
|
||||
|
||||
if ((phy_data & BMSR_LSTATUS) == 0) {
|
||||
/* link down */
|
||||
|
|
@ -2231,7 +2231,6 @@ index 1ef0c92..9cc1570 100644
|
|||
- dev_warn(&pdev->dev, "stop mac failed\n");
|
||||
- atl1c_set_aspm(hw, false);
|
||||
netif_carrier_off(netdev);
|
||||
netif_stop_queue(netdev);
|
||||
- atl1c_phy_reset(hw);
|
||||
- atl1c_phy_init(&adapter->hw);
|
||||
+ hw->hibernate = true;
|
||||
|
|
|
|||
13
kernel.spec
13
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 2
|
||||
%global baserelease 1
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
|
@ -66,7 +66,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 7
|
||||
%define stable_update 8
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
# Set rpm version accordingly
|
||||
|
|
@ -704,9 +704,6 @@ Patch22018: atl1c_net_next_update-3.4.patch
|
|||
Patch22055: crypto-testmgr-allow-aesni-intel-and-ghash_clmulni-intel.patch
|
||||
Patch22056: crypto-aesni-intel-fix-wrong-kfree-pointer.patch
|
||||
|
||||
#rhbz 772730
|
||||
Patch22058: ACPI-AC-check-the-return-value-of-power_supply_register.patch
|
||||
|
||||
#rhbz 836742
|
||||
Patch22059: uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch
|
||||
|
||||
|
|
@ -1330,9 +1327,6 @@ ApplyPatch atl1c_net_next_update-3.4.patch
|
|||
ApplyPatch crypto-testmgr-allow-aesni-intel-and-ghash_clmulni-intel.patch
|
||||
ApplyPatch crypto-aesni-intel-fix-wrong-kfree-pointer.patch
|
||||
|
||||
#rhbz 772730
|
||||
ApplyPatch ACPI-AC-check-the-return-value-of-power_supply_register.patch
|
||||
|
||||
#rhbz 836742
|
||||
ApplyPatch uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch
|
||||
|
||||
|
|
@ -2045,6 +2039,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Tue Aug 14 2012 Justin M. Forbes <jforbes@redhat.com> 3.4.8-1
|
||||
- Linux 3.4.8
|
||||
|
||||
* Fri Aug 03 2012 Josh Boyer <jwboyer@redhat.com>
|
||||
- CVE-2012-3412 sfc: potential rDOS through TCP MSS option (rhbz 844714 845558)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue