]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message
authorMiklos Szeredi <mszeredi@suse.cz>
Wed, 24 Aug 2011 08:20:17 +0000 (10:20 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 29 Aug 2011 21:08:09 +0000 (14:08 -0700)
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: Greg Kroah-Hartman <gregkh@suse.de>
fs/fuse/dev.c

index 650546f8612d44d1200e2530ec704f52ac3b592b..1facb3956a90d4d81609caf60cab73c6b898d0a3 100644 (file)
@@ -899,6 +899,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);