When opening or closing a lirc character device, the framework
provides to the user the possibility to keep track of opening or
closing of the device by calling two functions:

 - set_use_inc() when opening the device
 - set_use_dec() when closing the device

if those are not set by the lirc user, the system segfaults.
Check the pointer value before calling the above functions.

Signed-off-by: Andi Shyti <andi.sh...@samsung.com>
---
 drivers/media/rc/lirc_dev.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 0a3d65d..58dabdc 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -412,7 +412,10 @@ int lirc_unregister_driver(int minor)
                        ir->d.name, ir->d.minor);
                wake_up_interruptible(&ir->buf->wait_poll);
                mutex_lock(&ir->irctl_lock);
-               ir->d.set_use_dec(ir->d.data);
+
+               if (ir->d.set_use_dec)
+                       ir->d.set_use_dec(ir->d.data);
+
                module_put(cdev->owner);
                mutex_unlock(&ir->irctl_lock);
        } else {
@@ -471,7 +474,8 @@ int lirc_dev_fop_open(struct inode *inode, struct file 
*file)
        cdev = ir->cdev;
        if (try_module_get(cdev->owner)) {
                ir->open++;
-               retval = ir->d.set_use_inc(ir->d.data);
+               if (ir->d.set_use_inc)
+                       retval = ir->d.set_use_inc(ir->d.data);
 
                if (retval) {
                        module_put(cdev->owner);
@@ -512,7 +516,8 @@ int lirc_dev_fop_close(struct inode *inode, struct file 
*file)
 
        ir->open--;
        if (ir->attached) {
-               ir->d.set_use_dec(ir->d.data);
+               if (ir->d.set_use_dec)
+                       ir->d.set_use_dec(ir->d.data);
                module_put(cdev->owner);
        } else {
                lirc_irctl_cleanup(ir);
-- 
2.8.1

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to