浏览代码

[media] lirc_dev: fix potential segfault

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.shyti@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Andi Shyti 9 年之前
父节点
当前提交
8e5fa4c67d
共有 1 个文件被更改,包括 8 次插入3 次删除
  1. 8 3
      drivers/media/rc/lirc_dev.c

+ 8 - 3
drivers/media/rc/lirc_dev.c

@@ -411,7 +411,10 @@ int lirc_unregister_driver(int minor)
 			ir->d.name, ir->d.minor);
 			ir->d.name, ir->d.minor);
 		wake_up_interruptible(&ir->buf->wait_poll);
 		wake_up_interruptible(&ir->buf->wait_poll);
 		mutex_lock(&ir->irctl_lock);
 		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);
 		module_put(cdev->owner);
 		mutex_unlock(&ir->irctl_lock);
 		mutex_unlock(&ir->irctl_lock);
 	} else {
 	} else {
@@ -469,7 +472,8 @@ int lirc_dev_fop_open(struct inode *inode, struct file *file)
 	cdev = ir->cdev;
 	cdev = ir->cdev;
 	if (try_module_get(cdev->owner)) {
 	if (try_module_get(cdev->owner)) {
 		ir->open++;
 		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) {
 		if (retval) {
 			module_put(cdev->owner);
 			module_put(cdev->owner);
@@ -510,7 +514,8 @@ int lirc_dev_fop_close(struct inode *inode, struct file *file)
 
 
 	ir->open--;
 	ir->open--;
 	if (ir->attached) {
 	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);
 		module_put(cdev->owner);
 	} else {
 	} else {
 		lirc_irctl_cleanup(ir);
 		lirc_irctl_cleanup(ir);