Merge branch 'master' into upstream

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index f499803743e0..85105e50f7db 100644
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -274,9 +274,8 @@ static int check_perm(struct inode * inode, struct file * file)
         /* No error? Great, allocate a buffer for the file, and store it
          * it in file->private_data for easy access.
          */
-        buffer = kmalloc(sizeof(struct configfs_buffer),GFP_KERNEL);
+        buffer = kzalloc(sizeof(struct configfs_buffer),GFP_KERNEL);
         if (buffer) {
-                memset(buffer,0,sizeof(struct configfs_buffer));
                 init_MUTEX(&buffer->sem);
                 buffer->needs_read_fill = 1;
                 buffer->ops = ops;