4.4-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f7c81c7176c72c7899390754b4b038a64b296e4d ]
STM code takes references to the stm device and its module for the duration of the character device's existence or the stm_source link. Dropping these references is not well balanced everywhere, which may lead to leaks.
This patch balances the acquisition and releasing of these two references and annotates each site so that it's easier to verify correctness by reading the code.
Signed-off-by: Alexander Shishkin alexander.shishkin@linux.intel.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/hwtracing/stm/core.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index f8e46c38b565..cdc692d6cedd 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -114,6 +114,7 @@ struct stm_device *stm_find_device(const char *buf)
stm = to_stm_device(dev); if (!try_module_get(stm->owner)) { + /* matches class_find_device() above */ put_device(dev); return NULL; } @@ -126,7 +127,7 @@ struct stm_device *stm_find_device(const char *buf) * @stm: stm device, previously acquired by stm_find_device() * * This drops the module reference and device reference taken by - * stm_find_device(). + * stm_find_device() or stm_char_open(). */ void stm_put_device(struct stm_device *stm) { @@ -369,6 +370,8 @@ static int stm_char_open(struct inode *inode, struct file *file) return nonseekable_open(inode, file);
err_free: + /* matches class_find_device() above */ + put_device(dev); kfree(stmf);
return err; @@ -379,6 +382,11 @@ static int stm_char_release(struct inode *inode, struct file *file) struct stm_file *stmf = file->private_data;
stm_output_free(stmf->stm, &stmf->output); + + /* + * matches the stm_char_open()'s + * class_find_device() + try_module_get() + */ stm_put_device(stmf->stm); kfree(stmf);
@@ -540,10 +548,8 @@ static int stm_char_policy_set_ioctl(struct stm_file *stmf, void __user *arg) ret = stm->data->link(stm->data, stmf->output.master, stmf->output.channel);
- if (ret) { + if (ret) stm_output_free(stmf->stm, &stmf->output); - stm_put_device(stmf->stm); - }
err_free: kfree(id); @@ -680,6 +686,7 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, return 0;
err_device: + /* matches device_initialize() above */ put_device(&stm->dev); err_free: vfree(stm); @@ -792,7 +799,6 @@ static int stm_source_link_add(struct stm_source_device *src,
fail_free_output: stm_output_free(stm, &src->output); - stm_put_device(stm);
fail_detach: mutex_lock(&stm->link_mutex); @@ -906,8 +912,10 @@ static ssize_t stm_source_link_store(struct device *dev, return -EINVAL;
err = stm_source_link_add(src, link); - if (err) + if (err) { + /* matches the stm_find_device() above */ stm_put_device(link); + }
return err ? : count; }