rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix use after free in HID input (rhbz 1251877 1251880 1250279 1248741)

This commit is contained in:
Laura Abbott 2015-08-10 08:56:44 -07:00
parent 5faf8cde5f
commit b8a26da857
2 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
HID-hid-input-Fix-accessing-freed-memory-during-devi.patch Normal file
View File

@ -0,0 +1,53 @@
From 0621809e37936e7c2b3eac9165cf2aad7f9189eb Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Date: Mon, 3 Aug 2015 14:57:30 +0900
Subject: [PATCH] HID: hid-input: Fix accessing freed memory during device
disconnect
During unbinding the driver was dereferencing a pointer to memory
already freed by power_supply_unregister().
Driver was freeing its internal description of battery through pointers
stored in power_supply structure. However, because the core owns the
power supply instance, after calling power_supply_unregister() this
memory is freed and the driver cannot access these members.
Fix this by storing the pointer to internal description of battery in a
local variable before calling power_supply_unregister(), so the pointer
remains valid.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reported-by: H.J. Lu <hjl.tools@gmail.com>
Fixes: 297d716f6260 ("power_supply: Change ownership from driver to core")
Cc: <stable@vger.kernel.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
---
drivers/hid/hid-input.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 3511bbab..e3c6364 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -462,12 +462,15 @@ out:
static void hidinput_cleanup_battery(struct hid_device *dev)
{
+ const struct power_supply_desc *psy_desc;
+
if (!dev->battery)
return;
+ psy_desc = dev->battery->desc;
power_supply_unregister(dev->battery);
- kfree(dev->battery->desc->name);
- kfree(dev->battery->desc);
+ kfree(psy_desc->name);
+ kfree(psy_desc);
dev->battery = NULL;
}
#else /* !CONFIG_HID_BATTERY_STRENGTH */
--
2.4.3

10
kernel.spec
View File

@ -648,6 +648,10 @@ Patch26264: md-use-kzalloc-when-bitmap-is-disabled.patch
#rhbz 1244511
Patch507: HID-chicony-Add-support-for-Acer-Aspire-Switch-12.patch
#rhbz 1251877 1251880 1250279 1248741
# and probably more since ugh use after free bugs
Patch26265: HID-hid-input-Fix-accessing-freed-memory-during-devi.patch
# END OF PATCH DEFINITIONS
%endif
@ -1402,6 +1406,9 @@ ApplyPatch md-use-kzalloc-when-bitmap-is-disabled.patch
#rhbz 1244511
ApplyPatch HID-chicony-Add-support-for-Acer-Aspire-Switch-12.patch
#rhbz 1251877 1251880 1250279 1248741
ApplyPatch HID-hid-input-Fix-accessing-freed-memory-during-devi.patch
# END OF PATCH APPLICATIONS
%endif
@ -2261,6 +2268,9 @@ fi
# ||----w |
# || ||
%changelog
* Mon Aug 10 2015 Laura Abbott <labbott@fedoraproject.org>
- Fix use after free in HID input (rhbz 1251877 1251880 1250279 1248741)
* Tue Aug 04 2015 Josh Boyer <jwboyer@fedoraproject.org>
- Patch from Nicholas Kudriavtsev for Acer Switch 12 Fn keys (rhbz 1244511)