From: Miklos Szeredi <mszeredi@suse.cz>
Date: Wed, 24 Aug 2011 08:20:17 +0000 (+0200)
Subject: fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message
X-Git-Tag: v2.6.34.12~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0b55eccde1145e8e2b31fe855cdba3987676beb8;p=karo-tx-linux.git

fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message

commit c2183d1e9b3f313dd8ba2b1b0197c8d9fb86a7ae upstream.

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 <hanwenn@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index c235afc698a0..9897fe338818 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -901,6 +901,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);