Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 070baa51 authored by Roberto Sassu's avatar Roberto Sassu Committed by Tyler Hicks
Browse files

ecryptfs: missing initialization of the superblock 'magic' field 



This patch initializes the 'magic' field of ecryptfs filesystems to
ECRYPTFS_SUPER_MAGIC.

Signed-off-by: default avatarRoberto Sassu <roberto.sassu@polito.it>
[tyhicks: merge with 66cb7666]
Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
parent 2a8652f4

fs/ecryptfs/main.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/parser.h>

#include <linux/parser.h>

#include <linux/fs_stack.h>

#include <linux/fs_stack.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/magic.h>

#include "ecryptfs_kernel.h"

#include "ecryptfs_kernel.h"





/**

/**
@@ -564,6 +565,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags 
	ecryptfs_set_superblock_lower(s, path.dentry->d_sb);

	ecryptfs_set_superblock_lower(s, path.dentry->d_sb);

	s->s_maxbytes = path.dentry->d_sb->s_maxbytes;

	s->s_maxbytes = path.dentry->d_sb->s_maxbytes;

	s->s_blocksize = path.dentry->d_sb->s_blocksize;

	s->s_blocksize = path.dentry->d_sb->s_blocksize;

	s->s_magic = ECRYPTFS_SUPER_MAGIC;





	inode = ecryptfs_get_inode(path.dentry->d_inode, s);

	inode = ecryptfs_get_inode(path.dentry->d_inode, s);

	rc = PTR_ERR(inode);

	rc = PTR_ERR(inode);