From patchwork Tue Jan 3 13:14:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [maverick, maverick/ti-omap4, natty, natty/ti-omap4, CVE, 1/1] fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message Date: Tue, 03 Jan 2012 03:14:39 -0000 From: Andy Whitcroft X-Patchwork-Id: 133999 Message-Id: <1325596479-16407-2-git-send-email-apw@canonical.com> To: kernel-team@lists.ubuntu.com Cc: Andy Whitcroft From: Miklos Szeredi FUSE_NOTIFY_INVAL_ENTRY didn't check the length of the write so the message processing could overrun and result in a "kernel BUG at fs/fuse/dev.c:629!" Reported-by: Han-Wen Nienhuys Signed-off-by: Miklos Szeredi CC: stable@kernel.org (cherry picked from commit c2183d1e9b3f313dd8ba2b1b0197c8d9fb86a7ae) CVE-2011-3353 BugLink: http://bugs.launchpad.net/bugs/905058 Signed-off-by: Andy Whitcroft Acked-by: Seth Forshee --- fs/fuse/dev.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index e5cdabf..517430a 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1208,6 +1208,10 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size, if (outarg.namelen > FUSE_NAME_MAX) goto err; + err = -EINVAL; + if (size != sizeof(outarg) + outarg.namelen + 1) + goto err; + name.name = buf; name.len = outarg.namelen; err = fuse_copy_one(cs, buf, outarg.namelen + 1);