Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 18 Mar 2020 09:39:40 -0700
From:   Eric Biggers <ebiggers@kernel.org>
To:     linux-fsdevel@vger.kernel.org, viro@zeniv.linux.org.uk
Cc:     glider@google.com, arnd@arndb.de, gregkh@linuxfoundation.org,
        linux-kernel@vger.kernel.org, rafael@kernel.org,
        syzbot+fcab69d1ada3e8d6f06b@syzkaller.appspotmail.com,
        syzkaller-bugs@googlegroups.com
Subject: Re: [PATCH] libfs: fix infoleak in simple_attr_read()
Message-ID: <20200318163940.GB2334@sol.localdomain>
References: <CAG_fn=WvVp7Nxm5E+1dYs4guMYUV8D1XZEt_AZFF6rAQEbbAeg@mail.gmail.com>
 <20200308023849.988264-1-ebiggers@kernel.org>
 <20200313164511.GB907@sol.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200313164511.GB907@sol.localdomain>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Fri, Mar 13, 2020 at 09:45:11AM -0700, Eric Biggers wrote:
> On Sat, Mar 07, 2020 at 06:38:49PM -0800, Eric Biggers wrote:
> > From: Eric Biggers <ebiggers@google.com>
> > 
> > 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("\n");
> > 	}
> > 
> > Output:
> > 	5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a30
> > 
> > Fix the infoleak by making simple_attr_read() always fill
> > simple_attr::get_buf if it hasn't been filled yet.
> > 
> > Reported-by: syzbot+fcab69d1ada3e8d6f06b@syzkaller.appspotmail.com
> > Reported-by: Alexander Potapenko <glider@google.com>
> > Fixes: acaefc25d21f ("[PATCH] libfs: add simple attribute files")
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Eric Biggers <ebiggers@google.com>
> > ---
> >  fs/libfs.c | 8 +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/fs/libfs.c b/fs/libfs.c
> > index c686bd9caac6..3759fbacf522 100644
> > --- a/fs/libfs.c
> > +++ b/fs/libfs.c
> > @@ -891,7 +891,7 @@ int simple_attr_open(struct inode *inode, struct file *file,
> >  {
> >  	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 *file, char __user *buf,
> >  	if (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)
> > -- 
> > 2.25.1
> 
> Any comments on this?  Al, seems this is something you should pick up?
> 
> - Eric

Ping.