leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm class: Fix device leak in open error path

Browse Source 
Make sure to drop the reference taken by class_find_device() also on
allocation errors in open().

Signed-off-by: Johan Hovold <johan@kernel.org>
Fixes: 7bd1d4093c ("stm class: Introduce an abstraction for...")
Cc: stable@vger.kernel.org # v4.6+
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
This commit is contained in:
Johan Hovold
2016-11-18 14:17:31 +02:00
committed by Alexander Shishkin
parent a25f0944ba
commit a0ebf519b8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/hwtracing/stm/core.c
View File

@@ -361,7 +361,7 @@ static int stm_char_open(struct inode *inode, struct file *file)
struct stm_file *stmf; struct stm_file *stmf;
struct device *dev; struct device *dev;
unsigned int major = imajor(inode); unsigned int major = imajor(inode);
int err = -ENODEV; int err = -ENOMEM;
dev = class_find_device(&stm_class, NULL, &major, major_match); dev = class_find_device(&stm_class, NULL, &major, major_match);
if (!dev) if (!dev)
@@ -369,8 +369,9 @@ static int stm_char_open(struct inode *inode, struct file *file)
stmf = kzalloc(sizeof(*stmf), GFP_KERNEL); stmf = kzalloc(sizeof(*stmf), GFP_KERNEL);
if (!stmf) if (!stmf)
return -ENOMEM; goto err_put_device;
err = -ENODEV;
stm_output_init(&stmf->output); stm_output_init(&stmf->output);
stmf->stm = to_stm_device(dev); stmf->stm = to_stm_device(dev);
@@ -382,9 +383,10 @@ static int stm_char_open(struct inode *inode, struct file *file)
return nonseekable_open(inode, file); return nonseekable_open(inode, file);
err_free: err_free:
kfree(stmf);
err_put_device:
/* matches class_find_device() above */ /* matches class_find_device() above */
put_device(dev); put_device(dev);
kfree(stmf);
return err; return err;
} }