From 8338a6010d20abd249b04e79cf9ea568ad68084a Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Fri, 26 Nov 2010 14:06:35 -0300 Subject: [PATCH] --- yaml --- r: 226315 b: refs/heads/master c: 4c8b8698053c986f5f5249878eab70cb028a1023 h: refs/heads/master i: 226313: a44068c780128a577ba8b2117c1acf4ee1dbd2af 226311: eeff2099a616e2d52befb4d9e133d5266256e8f9 v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/ir-lirc-codec.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8d34ba4160c9..d30b94b9f639 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87d1a50ce45168cbaec10397e876286a398052c1 +refs/heads/master: 4c8b8698053c986f5f5249878eab70cb028a1023 diff --git a/trunk/drivers/media/rc/ir-lirc-codec.c b/trunk/drivers/media/rc/ir-lirc-codec.c index 1e87ee8e5c99..f011c5d9dea1 100644 --- a/trunk/drivers/media/rc/ir-lirc-codec.c +++ b/trunk/drivers/media/rc/ir-lirc-codec.c @@ -100,7 +100,8 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char *buf, struct lirc_codec *lirc; struct rc_dev *dev; int *txbuf; /* buffer with values to transmit */ - int ret = 0, count; + int ret = 0; + size_t count; lirc = lirc_get_pdata(file); if (!lirc) @@ -110,7 +111,7 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char *buf, return -EINVAL; count = n / sizeof(int); - if (count > LIRCBUF_SIZE || count % 2 == 0) + if (count > LIRCBUF_SIZE || count % 2 == 0 || n % sizeof(int) != 0) return -EINVAL; txbuf = memdup_user(buf, n);