summaryrefslogtreecommitdiffstats
path: root/fs/fuse
diff options
context:
space:
mode:
authorMateusz Jurczyk <mjurczyk@google.com>2017-06-07 12:26:49 +0200
committerBen Hutchings <ben@decadent.org.uk>2017-11-11 13:32:52 +0000
commit5b7024ecc540d96fe65c8378a57ba4891aa95577 (patch)
tree5d53f6d674bd85437c2d8612cb344c41157e6f3f /fs/fuse
parente6a2ab837b00f1f0ccbc920537ca9fb653591dfd (diff)
downloadlinux-stable-5b7024ecc540d96fe65c8378a57ba4891aa95577.tar.gz
linux-stable-5b7024ecc540d96fe65c8378a57ba4891aa95577.tar.bz2
linux-stable-5b7024ecc540d96fe65c8378a57ba4891aa95577.zip
fuse: initialize the flock flag in fuse_file on allocation
commit 68227c03cba84a24faf8a7277d2b1a03c8959c2c upstream. Before the patch, the flock flag could remain uninitialized for the lifespan of the fuse_file allocation. Unless set to true in fuse_file_flock(), it would remain in an indeterminate state until read in an if statement in fuse_release_common(). This could consequently lead to taking an unexpected branch in the code. The bug was discovered by a runtime instrumentation designed to detect use of uninitialized memory in the kernel. Signed-off-by: Mateusz Jurczyk <mjurczyk@google.com> Fixes: 37fb3a30b462 ("fuse: fix flock") Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index d583c976fff2..ab9fad6fb6b1 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -54,7 +54,7 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc)
{
struct fuse_file *ff;
- ff = kmalloc(sizeof(struct fuse_file), GFP_KERNEL);
+ ff = kzalloc(sizeof(struct fuse_file), GFP_KERNEL);
if (unlikely(!ff))
return NULL;