2010-07-03 08:06:57 +04:00
|
|
|
/*
|
|
|
|
* LIRC base driver
|
|
|
|
*
|
|
|
|
* by Artur Lipowski <alipowski@interia.pl>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/ioctl.h>
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/poll.h>
|
|
|
|
#include <linux/completion.h>
|
|
|
|
#include <linux/mutex.h>
|
|
|
|
#include <linux/wait.h>
|
|
|
|
#include <linux/unistd.h>
|
|
|
|
#include <linux/kthread.h>
|
|
|
|
#include <linux/bitops.h>
|
|
|
|
#include <linux/device.h>
|
|
|
|
#include <linux/cdev.h>
|
|
|
|
|
|
|
|
#include <media/lirc.h>
|
2010-07-16 21:25:33 +04:00
|
|
|
#include <media/lirc_dev.h>
|
2010-07-03 08:06:57 +04:00
|
|
|
|
2012-01-13 03:02:20 +04:00
|
|
|
static bool debug;
|
2010-07-03 08:06:57 +04:00
|
|
|
|
|
|
|
#define IRCTL_DEV_NAME "BaseRemoteCtl"
|
|
|
|
#define NOPLUG -1
|
|
|
|
#define LOGHEAD "lirc_dev (%s[%d]): "
|
|
|
|
|
|
|
|
static dev_t lirc_base_dev;
|
|
|
|
|
|
|
|
struct irctl {
|
|
|
|
struct lirc_driver d;
|
|
|
|
int attached;
|
|
|
|
int open;
|
|
|
|
|
|
|
|
struct mutex irctl_lock;
|
|
|
|
struct lirc_buffer *buf;
|
|
|
|
unsigned int chunk_size;
|
|
|
|
|
2011-05-27 23:56:50 +04:00
|
|
|
struct cdev *cdev;
|
|
|
|
|
2010-07-03 08:06:57 +04:00
|
|
|
struct task_struct *task;
|
|
|
|
long jiffies_to_wait;
|
|
|
|
};
|
|
|
|
|
|
|
|
static DEFINE_MUTEX(lirc_dev_lock);
|
|
|
|
|
|
|
|
static struct irctl *irctls[MAX_IRCTL_DEVICES];
|
|
|
|
|
|
|
|
/* Only used for sysfs but defined to void otherwise */
|
|
|
|
static struct class *lirc_class;
|
|
|
|
|
|
|
|
/* helper function
|
|
|
|
* initializes the irctl structure
|
|
|
|
*/
|
2010-10-17 04:29:50 +04:00
|
|
|
static void lirc_irctl_init(struct irctl *ir)
|
2010-07-03 08:06:57 +04:00
|
|
|
{
|
|
|
|
mutex_init(&ir->irctl_lock);
|
|
|
|
ir->d.minor = NOPLUG;
|
|
|
|
}
|
|
|
|
|
2010-10-17 04:29:50 +04:00
|
|
|
static void lirc_irctl_cleanup(struct irctl *ir)
|
2010-07-03 08:06:57 +04:00
|
|
|
{
|
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "cleaning up\n", ir->d.name, ir->d.minor);
|
|
|
|
|
|
|
|
device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor));
|
|
|
|
|
|
|
|
if (ir->buf != ir->d.rbuf) {
|
|
|
|
lirc_buffer_free(ir->buf);
|
|
|
|
kfree(ir->buf);
|
|
|
|
}
|
|
|
|
ir->buf = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* helper function
|
|
|
|
* reads key codes from driver and puts them into buffer
|
|
|
|
* returns 0 on success
|
|
|
|
*/
|
2010-10-17 04:29:50 +04:00
|
|
|
static int lirc_add_to_buf(struct irctl *ir)
|
2010-07-03 08:06:57 +04:00
|
|
|
{
|
|
|
|
if (ir->d.add_to_buf) {
|
|
|
|
int res = -ENODATA;
|
|
|
|
int got_data = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* service the device as long as it is returning
|
|
|
|
* data and we have space
|
|
|
|
*/
|
|
|
|
get_data:
|
|
|
|
res = ir->d.add_to_buf(ir->d.data, ir->buf);
|
|
|
|
if (res == 0) {
|
|
|
|
got_data++;
|
|
|
|
goto get_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (res == -ENODEV)
|
|
|
|
kthread_stop(ir->task);
|
|
|
|
|
|
|
|
return got_data ? 0 : res;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* main function of the polling thread
|
|
|
|
*/
|
|
|
|
static int lirc_thread(void *irctl)
|
|
|
|
{
|
|
|
|
struct irctl *ir = irctl;
|
|
|
|
|
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "poll thread started\n",
|
|
|
|
ir->d.name, ir->d.minor);
|
|
|
|
|
|
|
|
do {
|
|
|
|
if (ir->open) {
|
|
|
|
if (ir->jiffies_to_wait) {
|
|
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
|
|
schedule_timeout(ir->jiffies_to_wait);
|
|
|
|
}
|
|
|
|
if (kthread_should_stop())
|
|
|
|
break;
|
2010-10-17 04:29:50 +04:00
|
|
|
if (!lirc_add_to_buf(ir))
|
2010-07-03 08:06:57 +04:00
|
|
|
wake_up_interruptible(&ir->buf->wait_poll);
|
|
|
|
} else {
|
|
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
|
|
schedule();
|
|
|
|
}
|
|
|
|
} while (!kthread_should_stop());
|
|
|
|
|
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "poll thread ended\n",
|
|
|
|
ir->d.name, ir->d.minor);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-04-05 03:09:41 +04:00
|
|
|
static const struct file_operations lirc_dev_fops = {
|
2010-07-03 08:06:57 +04:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.read = lirc_dev_fop_read,
|
|
|
|
.write = lirc_dev_fop_write,
|
|
|
|
.poll = lirc_dev_fop_poll,
|
2010-08-02 22:43:35 +04:00
|
|
|
.unlocked_ioctl = lirc_dev_fop_ioctl,
|
2010-10-09 22:07:06 +04:00
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
.compat_ioctl = lirc_dev_fop_ioctl,
|
|
|
|
#endif
|
2010-07-03 08:06:57 +04:00
|
|
|
.open = lirc_dev_fop_open,
|
|
|
|
.release = lirc_dev_fop_close,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 20:52:59 +04:00
|
|
|
.llseek = noop_llseek,
|
2010-07-03 08:06:57 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static int lirc_cdev_add(struct irctl *ir)
|
|
|
|
{
|
2011-05-27 23:56:50 +04:00
|
|
|
int retval = -ENOMEM;
|
2010-07-03 08:06:57 +04:00
|
|
|
struct lirc_driver *d = &ir->d;
|
2011-05-27 23:56:50 +04:00
|
|
|
struct cdev *cdev;
|
|
|
|
|
|
|
|
cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);
|
|
|
|
if (!cdev)
|
|
|
|
goto err_out;
|
2010-07-03 08:06:57 +04:00
|
|
|
|
|
|
|
if (d->fops) {
|
2010-10-19 01:39:20 +04:00
|
|
|
cdev_init(cdev, d->fops);
|
|
|
|
cdev->owner = d->owner;
|
2010-07-03 08:06:57 +04:00
|
|
|
} else {
|
2010-10-19 01:39:20 +04:00
|
|
|
cdev_init(cdev, &lirc_dev_fops);
|
|
|
|
cdev->owner = THIS_MODULE;
|
2010-07-03 08:06:57 +04:00
|
|
|
}
|
2010-11-26 20:06:41 +03:00
|
|
|
retval = kobject_set_name(&cdev->kobj, "lirc%d", d->minor);
|
|
|
|
if (retval)
|
2011-05-27 23:56:50 +04:00
|
|
|
goto err_out;
|
2010-07-03 08:06:57 +04:00
|
|
|
|
2010-10-19 01:39:20 +04:00
|
|
|
retval = cdev_add(cdev, MKDEV(MAJOR(lirc_base_dev), d->minor), 1);
|
2011-05-27 23:56:50 +04:00
|
|
|
if (retval) {
|
2010-10-19 01:39:20 +04:00
|
|
|
kobject_put(&cdev->kobj);
|
2011-05-27 23:56:50 +04:00
|
|
|
goto err_out;
|
|
|
|
}
|
2010-07-03 08:06:57 +04:00
|
|
|
|
2011-05-27 23:56:50 +04:00
|
|
|
ir->cdev = cdev;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_out:
|
|
|
|
kfree(cdev);
|
2010-07-03 08:06:57 +04:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
int lirc_register_driver(struct lirc_driver *d)
|
|
|
|
{
|
|
|
|
struct irctl *ir;
|
|
|
|
int minor;
|
|
|
|
int bytes_in_key;
|
|
|
|
unsigned int chunk_size;
|
|
|
|
unsigned int buffer_size;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!d) {
|
|
|
|
printk(KERN_ERR "lirc_dev: lirc_register_driver: "
|
|
|
|
"driver pointer must be not NULL!\n");
|
|
|
|
err = -EBADRQC;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2010-10-18 19:02:01 +04:00
|
|
|
if (!d->dev) {
|
|
|
|
printk(KERN_ERR "%s: dev pointer not filled in!\n", __func__);
|
|
|
|
err = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2010-07-03 08:06:57 +04:00
|
|
|
if (MAX_IRCTL_DEVICES <= d->minor) {
|
|
|
|
dev_err(d->dev, "lirc_dev: lirc_register_driver: "
|
|
|
|
"\"minor\" must be between 0 and %d (%d)!\n",
|
2011-05-27 23:56:50 +04:00
|
|
|
MAX_IRCTL_DEVICES - 1, d->minor);
|
2010-07-03 08:06:57 +04:00
|
|
|
err = -EBADRQC;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (1 > d->code_length || (BUFLEN * 8) < d->code_length) {
|
|
|
|
dev_err(d->dev, "lirc_dev: lirc_register_driver: "
|
|
|
|
"code length in bits for minor (%d) "
|
|
|
|
"must be less than %d!\n",
|
|
|
|
d->minor, BUFLEN * 8);
|
|
|
|
err = -EBADRQC;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
dev_dbg(d->dev, "lirc_dev: lirc_register_driver: sample_rate: %d\n",
|
|
|
|
d->sample_rate);
|
|
|
|
if (d->sample_rate) {
|
|
|
|
if (2 > d->sample_rate || HZ < d->sample_rate) {
|
|
|
|
dev_err(d->dev, "lirc_dev: lirc_register_driver: "
|
|
|
|
"sample_rate must be between 2 and %d!\n", HZ);
|
|
|
|
err = -EBADRQC;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (!d->add_to_buf) {
|
|
|
|
dev_err(d->dev, "lirc_dev: lirc_register_driver: "
|
|
|
|
"add_to_buf cannot be NULL when "
|
|
|
|
"sample_rate is set\n");
|
|
|
|
err = -EBADRQC;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
} else if (!(d->fops && d->fops->read) && !d->rbuf) {
|
|
|
|
dev_err(d->dev, "lirc_dev: lirc_register_driver: "
|
|
|
|
"fops->read and rbuf cannot all be NULL!\n");
|
|
|
|
err = -EBADRQC;
|
|
|
|
goto out;
|
|
|
|
} else if (!d->rbuf) {
|
|
|
|
if (!(d->fops && d->fops->read && d->fops->poll &&
|
2010-08-02 22:43:35 +04:00
|
|
|
d->fops->unlocked_ioctl)) {
|
2010-07-03 08:06:57 +04:00
|
|
|
dev_err(d->dev, "lirc_dev: lirc_register_driver: "
|
2010-08-02 22:43:35 +04:00
|
|
|
"neither read, poll nor unlocked_ioctl can be NULL!\n");
|
2010-07-03 08:06:57 +04:00
|
|
|
err = -EBADRQC;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_lock(&lirc_dev_lock);
|
|
|
|
|
|
|
|
minor = d->minor;
|
|
|
|
|
|
|
|
if (minor < 0) {
|
|
|
|
/* find first free slot for driver */
|
|
|
|
for (minor = 0; minor < MAX_IRCTL_DEVICES; minor++)
|
|
|
|
if (!irctls[minor])
|
|
|
|
break;
|
|
|
|
if (MAX_IRCTL_DEVICES == minor) {
|
|
|
|
dev_err(d->dev, "lirc_dev: lirc_register_driver: "
|
|
|
|
"no free slots for drivers!\n");
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out_lock;
|
|
|
|
}
|
|
|
|
} else if (irctls[minor]) {
|
|
|
|
dev_err(d->dev, "lirc_dev: lirc_register_driver: "
|
|
|
|
"minor (%d) just registered!\n", minor);
|
|
|
|
err = -EBUSY;
|
|
|
|
goto out_lock;
|
|
|
|
}
|
|
|
|
|
|
|
|
ir = kzalloc(sizeof(struct irctl), GFP_KERNEL);
|
|
|
|
if (!ir) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out_lock;
|
|
|
|
}
|
2010-10-17 04:29:50 +04:00
|
|
|
lirc_irctl_init(ir);
|
2010-07-03 08:06:57 +04:00
|
|
|
irctls[minor] = ir;
|
|
|
|
d->minor = minor;
|
|
|
|
|
|
|
|
if (d->sample_rate) {
|
|
|
|
ir->jiffies_to_wait = HZ / d->sample_rate;
|
|
|
|
} else {
|
|
|
|
/* it means - wait for external event in task queue */
|
|
|
|
ir->jiffies_to_wait = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* some safety check 8-) */
|
|
|
|
d->name[sizeof(d->name)-1] = '\0';
|
|
|
|
|
|
|
|
bytes_in_key = BITS_TO_LONGS(d->code_length) +
|
|
|
|
(d->code_length % 8 ? 1 : 0);
|
|
|
|
buffer_size = d->buffer_size ? d->buffer_size : BUFLEN / bytes_in_key;
|
|
|
|
chunk_size = d->chunk_size ? d->chunk_size : bytes_in_key;
|
|
|
|
|
|
|
|
if (d->rbuf) {
|
|
|
|
ir->buf = d->rbuf;
|
|
|
|
} else {
|
|
|
|
ir->buf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
|
|
|
|
if (!ir->buf) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out_lock;
|
|
|
|
}
|
|
|
|
err = lirc_buffer_init(ir->buf, chunk_size, buffer_size);
|
|
|
|
if (err) {
|
|
|
|
kfree(ir->buf);
|
|
|
|
goto out_lock;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ir->chunk_size = ir->buf->chunk_size;
|
|
|
|
|
|
|
|
if (d->features == 0)
|
|
|
|
d->features = LIRC_CAN_REC_LIRCCODE;
|
|
|
|
|
|
|
|
ir->d = *d;
|
|
|
|
|
|
|
|
device_create(lirc_class, ir->d.dev,
|
|
|
|
MKDEV(MAJOR(lirc_base_dev), ir->d.minor), NULL,
|
|
|
|
"lirc%u", ir->d.minor);
|
|
|
|
|
|
|
|
if (d->sample_rate) {
|
|
|
|
/* try to fire up polling thread */
|
|
|
|
ir->task = kthread_run(lirc_thread, (void *)ir, "lirc_dev");
|
|
|
|
if (IS_ERR(ir->task)) {
|
|
|
|
dev_err(d->dev, "lirc_dev: lirc_register_driver: "
|
|
|
|
"cannot run poll thread for minor = %d\n",
|
|
|
|
d->minor);
|
|
|
|
err = -ECHILD;
|
|
|
|
goto out_sysfs;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
err = lirc_cdev_add(ir);
|
|
|
|
if (err)
|
|
|
|
goto out_sysfs;
|
|
|
|
|
|
|
|
ir->attached = 1;
|
|
|
|
mutex_unlock(&lirc_dev_lock);
|
|
|
|
|
|
|
|
dev_info(ir->d.dev, "lirc_dev: driver %s registered at minor = %d\n",
|
|
|
|
ir->d.name, ir->d.minor);
|
|
|
|
return minor;
|
|
|
|
|
|
|
|
out_sysfs:
|
|
|
|
device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor));
|
|
|
|
out_lock:
|
|
|
|
mutex_unlock(&lirc_dev_lock);
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(lirc_register_driver);
|
|
|
|
|
|
|
|
int lirc_unregister_driver(int minor)
|
|
|
|
{
|
|
|
|
struct irctl *ir;
|
2010-10-19 01:39:20 +04:00
|
|
|
struct cdev *cdev;
|
2010-07-03 08:06:57 +04:00
|
|
|
|
|
|
|
if (minor < 0 || minor >= MAX_IRCTL_DEVICES) {
|
2010-10-09 22:17:03 +04:00
|
|
|
printk(KERN_ERR "lirc_dev: %s: minor (%d) must be between "
|
2011-05-27 23:56:50 +04:00
|
|
|
"0 and %d!\n", __func__, minor, MAX_IRCTL_DEVICES - 1);
|
2010-07-03 08:06:57 +04:00
|
|
|
return -EBADRQC;
|
|
|
|
}
|
|
|
|
|
|
|
|
ir = irctls[minor];
|
2010-09-18 01:12:31 +04:00
|
|
|
if (!ir) {
|
2010-10-09 22:17:03 +04:00
|
|
|
printk(KERN_ERR "lirc_dev: %s: failed to get irctl struct "
|
|
|
|
"for minor %d!\n", __func__, minor);
|
2010-09-18 01:12:31 +04:00
|
|
|
return -ENOENT;
|
|
|
|
}
|
2010-07-03 08:06:57 +04:00
|
|
|
|
2011-05-27 23:56:50 +04:00
|
|
|
cdev = ir->cdev;
|
2010-07-03 08:06:57 +04:00
|
|
|
|
|
|
|
mutex_lock(&lirc_dev_lock);
|
|
|
|
|
|
|
|
if (ir->d.minor != minor) {
|
2010-10-09 22:17:03 +04:00
|
|
|
printk(KERN_ERR "lirc_dev: %s: minor (%d) device not "
|
|
|
|
"registered!\n", __func__, minor);
|
2010-07-03 08:06:57 +04:00
|
|
|
mutex_unlock(&lirc_dev_lock);
|
|
|
|
return -ENOENT;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* end up polling thread */
|
|
|
|
if (ir->task)
|
|
|
|
kthread_stop(ir->task);
|
|
|
|
|
|
|
|
dev_dbg(ir->d.dev, "lirc_dev: driver %s unregistered from minor = %d\n",
|
|
|
|
ir->d.name, ir->d.minor);
|
|
|
|
|
|
|
|
ir->attached = 0;
|
|
|
|
if (ir->open) {
|
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "releasing opened driver\n",
|
|
|
|
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);
|
2010-10-19 01:39:20 +04:00
|
|
|
module_put(cdev->owner);
|
2010-07-03 08:06:57 +04:00
|
|
|
mutex_unlock(&ir->irctl_lock);
|
|
|
|
} else {
|
2010-10-17 04:29:50 +04:00
|
|
|
lirc_irctl_cleanup(ir);
|
2010-10-19 01:39:20 +04:00
|
|
|
cdev_del(cdev);
|
2011-05-27 23:56:50 +04:00
|
|
|
kfree(cdev);
|
2010-07-03 08:06:57 +04:00
|
|
|
kfree(ir);
|
|
|
|
irctls[minor] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&lirc_dev_lock);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(lirc_unregister_driver);
|
|
|
|
|
|
|
|
int lirc_dev_fop_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
struct irctl *ir;
|
2010-10-19 01:39:20 +04:00
|
|
|
struct cdev *cdev;
|
2010-07-03 08:06:57 +04:00
|
|
|
int retval = 0;
|
|
|
|
|
|
|
|
if (iminor(inode) >= MAX_IRCTL_DEVICES) {
|
|
|
|
printk(KERN_WARNING "lirc_dev [%d]: open result = -ENODEV\n",
|
|
|
|
iminor(inode));
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mutex_lock_interruptible(&lirc_dev_lock))
|
|
|
|
return -ERESTARTSYS;
|
|
|
|
|
|
|
|
ir = irctls[iminor(inode)];
|
|
|
|
if (!ir) {
|
|
|
|
retval = -ENODEV;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "open called\n", ir->d.name, ir->d.minor);
|
|
|
|
|
|
|
|
if (ir->d.minor == NOPLUG) {
|
|
|
|
retval = -ENODEV;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ir->open) {
|
|
|
|
retval = -EBUSY;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2011-05-27 23:56:50 +04:00
|
|
|
cdev = ir->cdev;
|
2010-10-19 01:39:20 +04:00
|
|
|
if (try_module_get(cdev->owner)) {
|
|
|
|
ir->open++;
|
2010-07-03 08:06:57 +04:00
|
|
|
retval = ir->d.set_use_inc(ir->d.data);
|
|
|
|
|
|
|
|
if (retval) {
|
2010-10-19 01:39:20 +04:00
|
|
|
module_put(cdev->owner);
|
|
|
|
ir->open--;
|
2010-07-03 08:06:57 +04:00
|
|
|
} else {
|
|
|
|
lirc_buffer_clear(ir->buf);
|
|
|
|
}
|
|
|
|
if (ir->task)
|
|
|
|
wake_up_process(ir->task);
|
|
|
|
}
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (ir)
|
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "open result = %d\n",
|
|
|
|
ir->d.name, ir->d.minor, retval);
|
|
|
|
|
|
|
|
mutex_unlock(&lirc_dev_lock);
|
|
|
|
|
2010-08-15 20:51:56 +04:00
|
|
|
nonseekable_open(inode, file);
|
|
|
|
|
2010-07-03 08:06:57 +04:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(lirc_dev_fop_open);
|
|
|
|
|
|
|
|
int lirc_dev_fop_close(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
struct irctl *ir = irctls[iminor(inode)];
|
2011-05-27 23:56:50 +04:00
|
|
|
struct cdev *cdev;
|
2010-07-03 08:06:57 +04:00
|
|
|
|
2010-10-18 19:02:01 +04:00
|
|
|
if (!ir) {
|
|
|
|
printk(KERN_ERR "%s: called with invalid irctl\n", __func__);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2010-07-03 08:06:57 +04:00
|
|
|
|
2011-05-27 23:56:50 +04:00
|
|
|
cdev = ir->cdev;
|
|
|
|
|
2010-07-03 08:06:57 +04:00
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "close called\n", ir->d.name, ir->d.minor);
|
|
|
|
|
|
|
|
WARN_ON(mutex_lock_killable(&lirc_dev_lock));
|
|
|
|
|
2010-10-18 19:02:01 +04:00
|
|
|
ir->open--;
|
2010-07-03 08:06:57 +04:00
|
|
|
if (ir->attached) {
|
|
|
|
ir->d.set_use_dec(ir->d.data);
|
2010-10-19 01:39:20 +04:00
|
|
|
module_put(cdev->owner);
|
2010-07-03 08:06:57 +04:00
|
|
|
} else {
|
2010-10-17 04:29:50 +04:00
|
|
|
lirc_irctl_cleanup(ir);
|
2010-10-19 01:39:20 +04:00
|
|
|
cdev_del(cdev);
|
2010-07-03 08:06:57 +04:00
|
|
|
irctls[ir->d.minor] = NULL;
|
2011-05-27 23:56:50 +04:00
|
|
|
kfree(cdev);
|
2010-07-03 08:06:57 +04:00
|
|
|
kfree(ir);
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&lirc_dev_lock);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(lirc_dev_fop_close);
|
|
|
|
|
|
|
|
unsigned int lirc_dev_fop_poll(struct file *file, poll_table *wait)
|
|
|
|
{
|
2013-01-24 02:07:38 +04:00
|
|
|
struct irctl *ir = irctls[iminor(file_inode(file))];
|
2010-07-03 08:06:57 +04:00
|
|
|
unsigned int ret;
|
|
|
|
|
2010-10-18 19:02:01 +04:00
|
|
|
if (!ir) {
|
|
|
|
printk(KERN_ERR "%s: called with invalid irctl\n", __func__);
|
|
|
|
return POLLERR;
|
|
|
|
}
|
|
|
|
|
2010-07-03 08:06:57 +04:00
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "poll called\n", ir->d.name, ir->d.minor);
|
|
|
|
|
2010-11-17 08:12:23 +03:00
|
|
|
if (!ir->attached)
|
2010-07-03 08:06:57 +04:00
|
|
|
return POLLERR;
|
|
|
|
|
|
|
|
poll_wait(file, &ir->buf->wait_poll, wait);
|
|
|
|
|
|
|
|
if (ir->buf)
|
|
|
|
if (lirc_buffer_empty(ir->buf))
|
|
|
|
ret = 0;
|
|
|
|
else
|
|
|
|
ret = POLLIN | POLLRDNORM;
|
|
|
|
else
|
|
|
|
ret = POLLERR;
|
|
|
|
|
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "poll result = %d\n",
|
|
|
|
ir->d.name, ir->d.minor, ret);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(lirc_dev_fop_poll);
|
|
|
|
|
2010-08-02 22:43:35 +04:00
|
|
|
long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
2010-07-03 08:06:57 +04:00
|
|
|
{
|
2010-10-09 00:24:21 +04:00
|
|
|
__u32 mode;
|
2010-07-03 08:06:57 +04:00
|
|
|
int result = 0;
|
2013-01-24 02:07:38 +04:00
|
|
|
struct irctl *ir = irctls[iminor(file_inode(file))];
|
2010-07-03 08:06:57 +04:00
|
|
|
|
2010-10-09 22:07:06 +04:00
|
|
|
if (!ir) {
|
|
|
|
printk(KERN_ERR "lirc_dev: %s: no irctl found!\n", __func__);
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
2010-07-03 08:06:57 +04:00
|
|
|
|
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "ioctl called (0x%x)\n",
|
|
|
|
ir->d.name, ir->d.minor, cmd);
|
|
|
|
|
|
|
|
if (ir->d.minor == NOPLUG || !ir->attached) {
|
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "ioctl result = -ENODEV\n",
|
|
|
|
ir->d.name, ir->d.minor);
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_lock(&ir->irctl_lock);
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case LIRC_GET_FEATURES:
|
2010-10-09 00:24:21 +04:00
|
|
|
result = put_user(ir->d.features, (__u32 *)arg);
|
2010-07-03 08:06:57 +04:00
|
|
|
break;
|
|
|
|
case LIRC_GET_REC_MODE:
|
|
|
|
if (!(ir->d.features & LIRC_CAN_REC_MASK)) {
|
|
|
|
result = -ENOSYS;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
result = put_user(LIRC_REC2MODE
|
|
|
|
(ir->d.features & LIRC_CAN_REC_MASK),
|
2010-10-09 00:24:21 +04:00
|
|
|
(__u32 *)arg);
|
2010-07-03 08:06:57 +04:00
|
|
|
break;
|
|
|
|
case LIRC_SET_REC_MODE:
|
|
|
|
if (!(ir->d.features & LIRC_CAN_REC_MASK)) {
|
|
|
|
result = -ENOSYS;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2010-10-09 00:24:21 +04:00
|
|
|
result = get_user(mode, (__u32 *)arg);
|
2010-07-03 08:06:57 +04:00
|
|
|
if (!result && !(LIRC_MODE2REC(mode) & ir->d.features))
|
|
|
|
result = -EINVAL;
|
|
|
|
/*
|
|
|
|
* FIXME: We should actually set the mode somehow but
|
|
|
|
* for now, lirc_serial doesn't support mode changing either
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
case LIRC_GET_LENGTH:
|
2010-10-09 00:24:21 +04:00
|
|
|
result = put_user(ir->d.code_length, (__u32 *)arg);
|
2010-07-03 08:06:57 +04:00
|
|
|
break;
|
|
|
|
case LIRC_GET_MIN_TIMEOUT:
|
|
|
|
if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) ||
|
|
|
|
ir->d.min_timeout == 0) {
|
|
|
|
result = -ENOSYS;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2010-10-09 00:24:21 +04:00
|
|
|
result = put_user(ir->d.min_timeout, (__u32 *)arg);
|
2010-07-03 08:06:57 +04:00
|
|
|
break;
|
|
|
|
case LIRC_GET_MAX_TIMEOUT:
|
|
|
|
if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) ||
|
|
|
|
ir->d.max_timeout == 0) {
|
|
|
|
result = -ENOSYS;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2010-10-09 00:24:21 +04:00
|
|
|
result = put_user(ir->d.max_timeout, (__u32 *)arg);
|
2010-07-03 08:06:57 +04:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
result = -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "ioctl result = %d\n",
|
|
|
|
ir->d.name, ir->d.minor, result);
|
|
|
|
|
|
|
|
mutex_unlock(&ir->irctl_lock);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(lirc_dev_fop_ioctl);
|
|
|
|
|
|
|
|
ssize_t lirc_dev_fop_read(struct file *file,
|
2010-11-17 08:13:39 +03:00
|
|
|
char __user *buffer,
|
2010-07-03 08:06:57 +04:00
|
|
|
size_t length,
|
|
|
|
loff_t *ppos)
|
|
|
|
{
|
2013-01-24 02:07:38 +04:00
|
|
|
struct irctl *ir = irctls[iminor(file_inode(file))];
|
2010-10-18 19:02:01 +04:00
|
|
|
unsigned char *buf;
|
2010-07-03 08:06:57 +04:00
|
|
|
int ret = 0, written = 0;
|
|
|
|
DECLARE_WAITQUEUE(wait, current);
|
|
|
|
|
2010-10-18 19:02:01 +04:00
|
|
|
if (!ir) {
|
|
|
|
printk(KERN_ERR "%s: called with invalid irctl\n", __func__);
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
2010-07-03 08:06:57 +04:00
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "read called\n", ir->d.name, ir->d.minor);
|
|
|
|
|
2010-10-18 19:02:01 +04:00
|
|
|
buf = kzalloc(ir->chunk_size, GFP_KERNEL);
|
|
|
|
if (!buf)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2010-11-17 08:20:15 +03:00
|
|
|
if (mutex_lock_interruptible(&ir->irctl_lock)) {
|
|
|
|
ret = -ERESTARTSYS;
|
|
|
|
goto out_unlocked;
|
|
|
|
}
|
2010-07-03 08:06:57 +04:00
|
|
|
if (!ir->attached) {
|
2010-11-17 08:20:15 +03:00
|
|
|
ret = -ENODEV;
|
|
|
|
goto out_locked;
|
2010-07-03 08:06:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (length % ir->chunk_size) {
|
2010-11-17 08:20:15 +03:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto out_locked;
|
2010-07-03 08:06:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we add ourselves to the task queue before buffer check
|
|
|
|
* to avoid losing scan code (in case when queue is awaken somewhere
|
|
|
|
* between while condition checking and scheduling)
|
|
|
|
*/
|
|
|
|
add_wait_queue(&ir->buf->wait_poll, &wait);
|
|
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* while we didn't provide 'length' bytes, device is opened in blocking
|
|
|
|
* mode and 'copy_to_user' is happy, wait for data.
|
|
|
|
*/
|
|
|
|
while (written < length && ret == 0) {
|
|
|
|
if (lirc_buffer_empty(ir->buf)) {
|
|
|
|
/* According to the read(2) man page, 'written' can be
|
|
|
|
* returned as less than 'length', instead of blocking
|
|
|
|
* again, returning -EWOULDBLOCK, or returning
|
|
|
|
* -ERESTARTSYS */
|
|
|
|
if (written)
|
|
|
|
break;
|
|
|
|
if (file->f_flags & O_NONBLOCK) {
|
|
|
|
ret = -EWOULDBLOCK;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (signal_pending(current)) {
|
|
|
|
ret = -ERESTARTSYS;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&ir->irctl_lock);
|
|
|
|
schedule();
|
|
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
|
|
|
|
|
|
if (mutex_lock_interruptible(&ir->irctl_lock)) {
|
|
|
|
ret = -ERESTARTSYS;
|
V4L/DVB: IR/lirc_dev: fix locking in lirc_dev_fop_read
On Wed, Jul 07, 2010 at 02:52:58PM +0200, Jiri Slaby wrote:
> Hi,
>
> stanse found a locking error in lirc_dev_fop_read:
> if (mutex_lock_interruptible(&ir->irctl_lock))
> return -ERESTARTSYS;
> ...
> while (written < length && ret == 0) {
> if (mutex_lock_interruptible(&ir->irctl_lock)) { #1
> ret = -ERESTARTSYS;
> break;
> }
> ...
> }
>
> remove_wait_queue(&ir->buf->wait_poll, &wait);
> set_current_state(TASK_RUNNING);
> mutex_unlock(&ir->irctl_lock); #2
>
> If lock at #1 fails, it beaks out of the loop, with the lock unlocked,
> but there is another "unlock" at #2.
This should do the trick. Completely untested beyond compiling, but its
not exactly a complicated fix, and in practice, I'm not aware of anyone
ever actually tripping that locking bug, so there's zero functional change
in typical use here.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-07-07 18:29:44 +04:00
|
|
|
remove_wait_queue(&ir->buf->wait_poll, &wait);
|
|
|
|
set_current_state(TASK_RUNNING);
|
|
|
|
goto out_unlocked;
|
2010-07-03 08:06:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!ir->attached) {
|
|
|
|
ret = -ENODEV;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
lirc_buffer_read(ir->buf, buf);
|
|
|
|
ret = copy_to_user((void *)buffer+written, buf,
|
|
|
|
ir->buf->chunk_size);
|
2010-11-17 08:20:15 +03:00
|
|
|
if (!ret)
|
|
|
|
written += ir->buf->chunk_size;
|
|
|
|
else
|
|
|
|
ret = -EFAULT;
|
2010-07-03 08:06:57 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
remove_wait_queue(&ir->buf->wait_poll, &wait);
|
|
|
|
set_current_state(TASK_RUNNING);
|
2010-11-17 08:20:15 +03:00
|
|
|
|
|
|
|
out_locked:
|
2010-07-03 08:06:57 +04:00
|
|
|
mutex_unlock(&ir->irctl_lock);
|
|
|
|
|
V4L/DVB: IR/lirc_dev: fix locking in lirc_dev_fop_read
On Wed, Jul 07, 2010 at 02:52:58PM +0200, Jiri Slaby wrote:
> Hi,
>
> stanse found a locking error in lirc_dev_fop_read:
> if (mutex_lock_interruptible(&ir->irctl_lock))
> return -ERESTARTSYS;
> ...
> while (written < length && ret == 0) {
> if (mutex_lock_interruptible(&ir->irctl_lock)) { #1
> ret = -ERESTARTSYS;
> break;
> }
> ...
> }
>
> remove_wait_queue(&ir->buf->wait_poll, &wait);
> set_current_state(TASK_RUNNING);
> mutex_unlock(&ir->irctl_lock); #2
>
> If lock at #1 fails, it beaks out of the loop, with the lock unlocked,
> but there is another "unlock" at #2.
This should do the trick. Completely untested beyond compiling, but its
not exactly a complicated fix, and in practice, I'm not aware of anyone
ever actually tripping that locking bug, so there's zero functional change
in typical use here.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-07-07 18:29:44 +04:00
|
|
|
out_unlocked:
|
2010-10-18 19:02:01 +04:00
|
|
|
kfree(buf);
|
2010-07-03 08:06:57 +04:00
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "read result = %s (%d)\n",
|
2010-11-17 08:20:15 +03:00
|
|
|
ir->d.name, ir->d.minor, ret ? "<fail>" : "<ok>", ret);
|
2010-07-03 08:06:57 +04:00
|
|
|
|
|
|
|
return ret ? ret : written;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(lirc_dev_fop_read);
|
|
|
|
|
|
|
|
void *lirc_get_pdata(struct file *file)
|
|
|
|
{
|
2013-01-25 04:00:58 +04:00
|
|
|
return irctls[iminor(file_inode(file))]->d.data;
|
2010-07-03 08:06:57 +04:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(lirc_get_pdata);
|
|
|
|
|
|
|
|
|
2010-11-17 08:13:39 +03:00
|
|
|
ssize_t lirc_dev_fop_write(struct file *file, const char __user *buffer,
|
2010-07-03 08:06:57 +04:00
|
|
|
size_t length, loff_t *ppos)
|
|
|
|
{
|
2013-01-24 02:07:38 +04:00
|
|
|
struct irctl *ir = irctls[iminor(file_inode(file))];
|
2010-07-03 08:06:57 +04:00
|
|
|
|
2010-10-18 19:02:01 +04:00
|
|
|
if (!ir) {
|
|
|
|
printk(KERN_ERR "%s: called with invalid irctl\n", __func__);
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
2010-07-03 08:06:57 +04:00
|
|
|
dev_dbg(ir->d.dev, LOGHEAD "write called\n", ir->d.name, ir->d.minor);
|
|
|
|
|
|
|
|
if (!ir->attached)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(lirc_dev_fop_write);
|
|
|
|
|
|
|
|
|
|
|
|
static int __init lirc_dev_init(void)
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
lirc_class = class_create(THIS_MODULE, "lirc");
|
|
|
|
if (IS_ERR(lirc_class)) {
|
|
|
|
retval = PTR_ERR(lirc_class);
|
|
|
|
printk(KERN_ERR "lirc_dev: class_create failed\n");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
retval = alloc_chrdev_region(&lirc_base_dev, 0, MAX_IRCTL_DEVICES,
|
|
|
|
IRCTL_DEV_NAME);
|
|
|
|
if (retval) {
|
|
|
|
class_destroy(lirc_class);
|
|
|
|
printk(KERN_ERR "lirc_dev: alloc_chrdev_region failed\n");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
printk(KERN_INFO "lirc_dev: IR Remote Control driver registered, "
|
|
|
|
"major %d \n", MAJOR(lirc_base_dev));
|
|
|
|
|
|
|
|
error:
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void __exit lirc_dev_exit(void)
|
|
|
|
{
|
|
|
|
class_destroy(lirc_class);
|
|
|
|
unregister_chrdev_region(lirc_base_dev, MAX_IRCTL_DEVICES);
|
|
|
|
printk(KERN_INFO "lirc_dev: module unloaded\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(lirc_dev_init);
|
|
|
|
module_exit(lirc_dev_exit);
|
|
|
|
|
|
|
|
MODULE_DESCRIPTION("LIRC base driver module");
|
|
|
|
MODULE_AUTHOR("Artur Lipowski");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
|
|
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
|
|
|
MODULE_PARM_DESC(debug, "Enable debugging messages");
|