libfs-fix-infoleak-in-simple_attr_read.patch removed from -mm tree
The patch titled
Subject: libfs: fix infoleak in simple_attr_read()
has been removed from the -mm tree. Its filename was
libfs-fix-infoleak-in-simple_attr_read.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Eric Biggers <[email protected]>
Subject: libfs: fix infoleak in simple_attr_read()
Reading from a debugfs file at a nonzero position, without first reading at position 0, leaks uninitialized memory to userspace.
It's a bit tricky to do this, since lseek() and pread() aren't allowed on these files, and write() doesn't update the position on them. But writing to them with splice() *does* update the position:
#define _GNU_SOURCE 1
#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
int main()
{
int pipes[2], fd, n, i;
char buf[32];
pipe(pipes);
write(pipes[1], "0", 1);
fd = open("/sys/kernel/debug/fault_around_bytes", O_RDWR);
splice(pipes[0], NULL, fd, NULL, 1, 0);
n = read(fd, buf, sizeof(buf));
for (i = 0; i < n; i++)
printf("%02x", buf[i]);
printf("
");
}Output:
5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a30
Fix the infoleak by making simple_attr_read() always fill simple_attr::get_buf if it hasn't been filled yet.
---
fs/libfs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
fs/libfs.c renamed from fs/libfs.c~libfs-fix-infoleak-in-simple_attr_read +5 -3
@@ -891,7 +891,7 @@ int simple_attr_open(struct inode *inode {struct simple_attr *attr; - attr =kmalloc (sizeof (*attr),GFP_KERNEL ); + attr =kzalloc (sizeof (*attr),GFP_KERNEL );if (!attr)return -ENOMEM ;
@@ -931,9 +931,11 @@ ssize_t simple_attr_read(struct file *fiif (ret)return ret; -if (*ppos) {/* continued read */ +if (*ppos && attr->get_buf[0 ]) { +/* continued read */ size =strlen (attr->get_buf); - }else {/* first read */ + }else { +/* first read */ u64 val; ret = attr->get (attr->data, &val);if (ret)
_
Patches currently in -mm which might be from [email protected] are
kmod-make-request_module-return-an-error-when-autoloading-is-disabled.patch fs-filesystemsc-downgrade-user-reachable-warn_once-to-pr_warn_once.patch docs-admin-guide-document-the-kernelmodprobe-sysctl.patch selftests-kmod-fix-handling-test-numbers-above-9.patch selftests-kmod-test-disabling-module-autoloading.patch