[PATCH 1/1] drivers: rtc: Add module_put on error path in rtc_proc_open

From: Alexander Strakh
Date: Fri Jan 28 2011 - 07:53:16 EST


From: Alexander Strakh <cromlehg@xxxxxxxxx>

In file drivers/rtc/rtc-proc.c in linux-2.6.37:

The seq_open function can return -ENOMEM.

86 if (!try_module_get(THIS_MODULE))
87 return -ENODEV;
88
89 return single_open(file, rtc_proc_show, rtc);

In this case before exiting (line 89) from rtc_proc_open
the module_put(THIS_MODULE) must be called.

Found by Linux Device Drivers Verification Project

Signed-off-by: Alexander Strakh <strakh@xxxxxxxxx>
---
drivers/rtc/rtc-proc.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index c086fc3..242bbf8 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -81,12 +81,16 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)

static int rtc_proc_open(struct inode *inode, struct file *file)
{
+ int ret;
struct rtc_device *rtc = PDE(inode)->data;

if (!try_module_get(THIS_MODULE))
return -ENODEV;

- return single_open(file, rtc_proc_show, rtc);
+ ret = single_open(file, rtc_proc_show, rtc);
+ if (ret)
+ module_put(THIS_MODULE);
+ return ret;
}

static int rtc_proc_release(struct inode *inode, struct file *file)
--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/