Skip to content

Commit

Permalink
hwmon: (fschmd) Fix a memleak on multiple opens of /dev/watchdog
Browse files Browse the repository at this point in the history
When /dev/watchdog gets opened a second time we return -EBUSY, but
we already have got a kref then, so we end up leaking our data struct.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: stable@kernel.org
  • Loading branch information
Hans de Goede authored and Jean Delvare committed Jan 25, 2010
1 parent 5542482 commit c453615
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/hwmon/fschmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,7 @@ static int watchdog_stop(struct fschmd_data *data)
static int watchdog_open(struct inode *inode, struct file *filp)
{
struct fschmd_data *pos, *data = NULL;
int watchdog_is_open;

/* We get called from drivers/char/misc.c with misc_mtx hold, and we
call misc_register() from fschmd_probe() with watchdog_data_mutex
Expand All @@ -782,10 +783,12 @@ static int watchdog_open(struct inode *inode, struct file *filp)
}
}
/* Note we can never not have found data, so we don't check for this */
kref_get(&data->kref);
watchdog_is_open = test_and_set_bit(0, &data->watchdog_is_open);
if (!watchdog_is_open)
kref_get(&data->kref);
mutex_unlock(&watchdog_data_mutex);

if (test_and_set_bit(0, &data->watchdog_is_open))
if (watchdog_is_open)
return -EBUSY;

/* Start the watchdog */
Expand Down

0 comments on commit c453615

Please sign in to comment.