Skip to contentSkip to conversation

ibmasm: don't write out of bounds in read handler

PATCH In review Jann Horn 2 participants 2 messages Jul 7, 2018 Char and misc drivers

lore
Share & tools
lore

Jann Horn

author
#0 lore raw

PATCH 1/1 ibmasm: don't write out of bounds in read handler

This read handler had a lot of custom logic and wrote outside the bounds of the provided buffer. This could lead to kernel and userspace memory corruption. Just use simple_read_from_buffer() with a stack buffer.

Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")

---
NOTE: I put a "CC: stable" tag on this commit because it's a simple change and I don't know whether bugs in this code matter; I don't have any idea what the userland for this looks like.
If it's not important, feel free to remove the tag.

 drivers/misc/ibmasm/ibmasmfs.c | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)
drivers/misc/ibmasm/ibmasmfs.c +3 -24
index e05c3245930a..fa840666bdd1 100644
@@ -507,35 +507,14 @@ static int remote_settings_file_close(struct inode *inode, struct file *file)
 static ssize_t remote_settings_file_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
 	void __iomem *address = (void __iomem *)file->private_data;
-	unsigned char *page;
-	int retval;
 	int len = 0;
 	unsigned int value;
-
-	if (*offset < 0)
-		return -EINVAL;
-	if (count == 0 || count > 1024)
-		return 0;
-	if (*offset != 0)
-		return 0;
-
-	page = (unsigned char *)__get_free_page(GFP_KERNEL);
-	if (!page)
-		return -ENOMEM;
+	char lbuf[20];
 
 	value = readl(address);
-	len = sprintf(page, "%d\n", value);
-
-	if (copy_to_user(buf, page, len)) {
-		retval = -EFAULT;
-		goto exit;
-	}
-	*offset += len;
-	retval = len;
+	len = snprintf(lbuf, sizeof(lbuf), "%d\n", value);
 
-exit:
-	free_page((unsigned long)page);
-	return retval;
+	return simple_read_from_buffer(buf, count, offset, lbuf, len);
 }
 
 static ssize_t remote_settings_file_write(struct file *file, const char __user *ubuff, size_t count, loff_t *offset)
Signature · 1 line
2.18.0.203.gfac676dfb9-goog
#1 lore raw
Quoted 4 lines · Jann Horn

This read handler had a lot of custom logic and wrote outside the bounds of the provided buffer. This could lead to kernel and userspace memory corruption. Just use simple_read_from_buffer() with a stack buffer.

Quoted 8 lines
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")

---
NOTE: I put a "CC: stable" tag on this commit because it's a simple change and I don't know whether bugs in this code matter; I don't have any idea what the userland for this looks like.
If it's not important, feel free to remove the tag.

Looks worthy of a stable tree inclusion, thanks. I've kept it and queued the patch up now.

greg k-h