Skip to content

Commit

Permalink
HID: lg4ff: Remove sysfs iface before deallocating memory
Browse files Browse the repository at this point in the history
This patch fixes a possible race condition caused by the sysfs
interface being removed after the memory used by the interface
was already kfree'd.

Signed-off-by: Michal Malý <madcatsxter@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Michal Malý authored and Jiri Kosina committed Apr 3, 2012
1 parent 8577dbf commit 6a2e176
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 0 additions & 2 deletions drivers/hid/hid-lg.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef __HID_LG_H
#define __HID_LG_H

#include <linux/spinlock.h>

struct lg_drv_data {
unsigned long quirks;
void *device_props; /* Device specific properties */
Expand Down
6 changes: 4 additions & 2 deletions drivers/hid/hid-lg4ff.c
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,9 @@ int lg4ff_deinit(struct hid_device *hid)
bool found = 0;
struct lg4ff_device_entry *entry;
struct list_head *h, *g;

device_remove_file(&hid->dev, &dev_attr_range);

list_for_each_safe(h, g, &device_list.list) {
entry = list_entry(h, struct lg4ff_device_entry, list);
if (strcmp(entry->device_id, (&hid->dev)->kobj.name) == 0) {
Expand All @@ -478,11 +481,10 @@ int lg4ff_deinit(struct hid_device *hid)
}

if (!found) {
dbg_hid("Device entry not found!\n");
hid_err(hid, "Device entry not found!\n");
return -1;
}

device_remove_file(&hid->dev, &dev_attr_range);
dbg_hid("Device successfully unregistered\n");
return 0;
}

0 comments on commit 6a2e176

Please sign in to comment.