* [PATCH] drbd: add module_put() on error path in drbd_proc_open()
@ 2013-03-01 21:39 Alexey Khoroshilov
2013-03-04 20:31 ` Philipp Reisner
0 siblings, 1 reply; 2+ messages in thread
From: Alexey Khoroshilov @ 2013-03-01 21:39 UTC (permalink / raw)
To: Lars Ellenberg, Philipp Reisner
Cc: Alexey Khoroshilov, drbd-user, linux-kernel, ldv-project
If single_open() fails in drbd_proc_open(), module refcount is left incremented.
The patch adds module_put() on the error path.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
---
drivers/block/drbd/drbd_proc.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c
index 56672a6..30fe0a5 100644
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@ -313,8 +313,14 @@ static int drbd_seq_show(struct seq_file *seq, void *v)
static int drbd_proc_open(struct inode *inode, struct file *file)
{
- if (try_module_get(THIS_MODULE))
- return single_open(file, drbd_seq_show, PDE(inode)->data);
+ int err;
+
+ if (try_module_get(THIS_MODULE)) {
+ err = single_open(file, drbd_seq_show, PDE(inode)->data);
+ if (err)
+ module_put(THIS_MODULE);
+ return err;
+ }
return -ENODEV;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] drbd: add module_put() on error path in drbd_proc_open()
2013-03-01 21:39 [PATCH] drbd: add module_put() on error path in drbd_proc_open() Alexey Khoroshilov
@ 2013-03-04 20:31 ` Philipp Reisner
0 siblings, 0 replies; 2+ messages in thread
From: Philipp Reisner @ 2013-03-04 20:31 UTC (permalink / raw)
To: Alexey Khoroshilov; +Cc: Lars Ellenberg, drbd-user, linux-kernel, ldv-project
Hi Alexey,
Thanks a lot! I have put it into our tree.
http://git.drbd.org/gitweb.cgi?p=drbd-8.4.git
I intend to get it into the 3.10 merge window.
Best,
Phil
> If single_open() fails in drbd_proc_open(), module refcount is left
> incremented. The patch adds module_put() on the error path.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
> ---
> drivers/block/drbd/drbd_proc.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c
> index 56672a6..30fe0a5 100644
> --- a/drivers/block/drbd/drbd_proc.c
> +++ b/drivers/block/drbd/drbd_proc.c
> @@ -313,8 +313,14 @@ static int drbd_seq_show(struct seq_file *seq, void *v)
>
> static int drbd_proc_open(struct inode *inode, struct file *file)
> {
> - if (try_module_get(THIS_MODULE))
> - return single_open(file, drbd_seq_show, PDE(inode)->data);
> + int err;
> +
> + if (try_module_get(THIS_MODULE)) {
> + err = single_open(file, drbd_seq_show, PDE(inode)->data);
> + if (err)
> + module_put(THIS_MODULE);
> + return err;
> + }
> return -ENODEV;
> }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-04 20:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-01 21:39 [PATCH] drbd: add module_put() on error path in drbd_proc_open() Alexey Khoroshilov
2013-03-04 20:31 ` Philipp Reisner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox