linux-kernel - [PATCH 5/9] staging: panel: check put

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 30 Jul 2010 15:08:42 +0400
From:	Kulikov Vasiliy <segooon@...il.com>
To:	kernel-janitors@...r.kernel.org
Cc:	Greg Kroah-Hartman <gregkh@...e.de>, Willy Tarreau <w@....eu>,
	Peter Huewe <peterhuewe@....de>,
	Andy Shevchenko <andy.shevchenko@...il.com>,
	Julia Lawall <julia@...u.dk>, devel@...verdev.osuosl.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH 5/9] staging: panel: check put_user() return value

put_user() may fail, if so return -EFAULT and do not update driver
pointers.

Signed-off-by: Kulikov Vasiliy <segooon@...il.com>
---
 drivers/staging/panel/panel.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index f58da32..57f4946 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -1589,25 +1589,30 @@ void lcd_init(void)
 static ssize_t keypad_read(struct file *file,
 			   char *buf, size_t count, loff_t *ppos)
 {
-
+	int buflen = keypad_buflen;
 	unsigned i = *ppos;
 	char *tmp = buf;
+	int start = keypad_start;
 
-	if (keypad_buflen == 0) {
+	if (buflen == 0) {
 		if (file->f_flags & O_NONBLOCK)
 			return -EAGAIN;
 
 		interruptible_sleep_on(&keypad_read_wait);
 		if (signal_pending(current))
 			return -EINTR;
+		buflen = keypad_buflen;
 	}
 
-	for (; count-- > 0 && (keypad_buflen > 0);
-	     ++i, ++tmp, --keypad_buflen) {
-		put_user(keypad_buffer[keypad_start], tmp);
-		keypad_start = (keypad_start + 1) % KEYPAD_BUFFER;
+	for (; count-- > 0 && (buflen > 0);
+	     ++i, ++tmp, --buflen) {
+		if (put_user(keypad_buffer[start], tmp))
+			return -EFAULT;
+		start = (start + 1) % KEYPAD_BUFFER;
 	}
 	*ppos = i;
+	keypad_buflen = buflen;
+	keypad_start = start;
 
 	return tmp - buf;
 }
-- 
1.7.0.4

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