diff options
| author | Johan Hovold <johan@kernel.org> | 2016-11-18 14:17:31 +0200 |
|---|---|---|
| committer | Alexander Shishkin <alexander.shishkin@linux.intel.com> | 2016-11-18 16:54:39 +0200 |
| commit | a0ebf519b8a2666438d999c62995618c710573e5 (patch) | |
| tree | 40ea96d5814491ac0f0e784c75bc69b24ecabf7d /drivers/hwtracing/stm | |
| parent | a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 (diff) | |
| download | talos-obmc-linux-a0ebf519b8a2666438d999c62995618c710573e5.tar.gz talos-obmc-linux-a0ebf519b8a2666438d999c62995618c710573e5.zip | |
stm class: Fix device leak in open error path
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: 7bd1d4093c2f ("stm class: Introduce an abstraction for...")
Cc: stable@vger.kernel.org # v4.6+
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Diffstat (limited to 'drivers/hwtracing/stm')
| -rw-r--r-- | drivers/hwtracing/stm/core.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index 51f81d64ca37..a6ea387b5b00 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -361,7 +361,7 @@ static int stm_char_open(struct inode *inode, struct file *file) struct stm_file *stmf; struct device *dev; unsigned int major = imajor(inode); - int err = -ENODEV; + int err = -ENOMEM; dev = class_find_device(&stm_class, NULL, &major, major_match); if (!dev) @@ -369,8 +369,9 @@ static int stm_char_open(struct inode *inode, struct file *file) stmf = kzalloc(sizeof(*stmf), GFP_KERNEL); if (!stmf) - return -ENOMEM; + goto err_put_device; + err = -ENODEV; stm_output_init(&stmf->output); 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); err_free: + kfree(stmf); +err_put_device: /* matches class_find_device() above */ put_device(dev); - kfree(stmf); return err; } |
