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

Commit 9370915e authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

Merge remote-tracking branch 'origin/upstream-f2fs-stable-linux-4.9.y' into android-4.9 



* origin/upstream-f2fs-stable-linux-4.9.y:
  ext4: don't bother checking for encryption key in ->mmap()
  fscrypt: remove filesystem specific build config option
  f2fs: use IS_ENCRYPTED() to check encryption status
  ext4: use IS_ENCRYPTED() to check encryption status
  fscrypt: return -EXDEV for incompatible rename or link into encrypted dir
  fscrypt: remove CRYPTO_CTR dependency
  fscrypt: add Adiantum support / removed speck
  ext4: switch to fscrypt_prepare_setattr()
  ext4: switch to fscrypt_prepare_rename()
  ext4: switch to fscrypt_prepare_link()
  ext4: switch to fscrypt_file_open()
  ext4, dax: set ext4_dax_aops for dax files

Change-Id: I31eeeb3670e1f46d77018ec7f9994ecf5d8a1a4e
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@google.com>
parents a85e9696 62a3a664

Documentation/filesystems/fscrypt.rst

+12 −4
Original line number Diff line number Diff line
@@ -343,9 +343,9 @@ FS_IOC_SET_ENCRYPTION_POLICY can fail with the following errors: 
- ``ENOTEMPTY``: the file is unencrypted and is a nonempty directory

- ``ENOTTY``: this type of filesystem does not implement encryption

- ``EOPNOTSUPP``: the kernel was not configured with encryption

  support for this filesystem, or the filesystem superblock has not

  support for filesystems, or the filesystem superblock has not

  had encryption enabled on it.  (For example, to use encryption on an

  ext4 filesystem, CONFIG_EXT4_ENCRYPTION must be enabled in the

  ext4 filesystem, CONFIG_FS_ENCRYPTION must be enabled in the

  kernel config, and the superblock must have had the "encrypt"

  feature flag enabled using ``tune2fs -O encrypt`` or ``mkfs.ext4 -O

  encrypt``.)
@@ -451,10 +451,18 @@ astute users may notice some differences in behavior: 
- Unencrypted files, or files encrypted with a different encryption

  policy (i.e. different key, modes, or flags), cannot be renamed or

  linked into an encrypted directory; see `Encryption policy

  enforcement`_.  Attempts to do so will fail with EPERM.  However,

  enforcement`_.  Attempts to do so will fail with EXDEV.  However,

  encrypted files can be renamed within an encrypted directory, or

  into an unencrypted directory.



  Note: "moving" an unencrypted file into an encrypted directory, e.g.

  with the `mv` program, is implemented in userspace by a copy

  followed by a delete.  Be aware that the original unencrypted data

  may remain recoverable from free space on the disk; prefer to keep

  all files encrypted from the very beginning.  The `shred` program

  may be used to overwrite the source files but isn't guaranteed to be

  effective on all filesystems and storage devices.



- Direct I/O is not supported on encrypted files.  Attempts to use

  direct I/O on such files will fall back to buffered I/O.
@@ -541,7 +549,7 @@ not be encrypted. 
Except for those special files, it is forbidden to have unencrypted

files, or files encrypted with a different encryption policy, in an

encrypted directory tree.  Attempts to link or rename such a file into

an encrypted directory will fail with EPERM.  This is also enforced

an encrypted directory will fail with EXDEV.  This is also enforced

during ->lookup() to provide limited protection against offline

attacks that try to disable or downgrade encryption in known locations

where applications may later write sensitive data.  It is recommended

arch/mips/configs/generic_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ CONFIG_HID_MONTEREY=y 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FANOTIFY=y

CONFIG_FUSE_FS=y

CONFIG_CUSE=y

fs/crypto/Kconfig

+4 −3
Original line number Diff line number Diff line 
config FS_ENCRYPTION

	tristate "FS Encryption (Per-file encryption)"

	bool "FS Encryption (Per-file encryption)"

	select CRYPTO

	select CRYPTO_AES

	select CRYPTO_CBC

	select CRYPTO_ECB

	select CRYPTO_XTS

	select CRYPTO_CTS

	select CRYPTO_CTR

	select CRYPTO_SHA256

	select KEYS

	help

	  Enable encryption of files and directories.  This

	  feature is similar to ecryptfs, but it is more memory

	  efficient since it avoids caching the encrypted and

	  decrypted pages in the page cache.
 
	  decrypted pages in the page cache.  Currently Ext4,

	  F2FS and UBIFS make use of this feature.

fs/crypto/fscrypt_private.h

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#ifndef _FSCRYPT_PRIVATE_H

#define _FSCRYPT_PRIVATE_H



#define __FS_HAS_ENCRYPTION 1

#include <linux/fscrypt.h>

#include <crypto/hash.h>

fs/crypto/hooks.c

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ int __fscrypt_prepare_link(struct inode *inode, struct inode *dir) 
		return err;



	if (!fscrypt_has_permitted_context(dir, inode))

		return -EPERM;

		return -EXDEV;



	return 0;

}
@@ -82,13 +82,13 @@ int __fscrypt_prepare_rename(struct inode *old_dir, struct dentry *old_dentry, 
		if (IS_ENCRYPTED(new_dir) &&

		    !fscrypt_has_permitted_context(new_dir,

						   d_inode(old_dentry)))

			return -EPERM;

			return -EXDEV;



		if ((flags & RENAME_EXCHANGE) &&

		    IS_ENCRYPTED(old_dir) &&

		    !fscrypt_has_permitted_context(old_dir,

						   d_inode(new_dentry)))

			return -EPERM;

			return -EXDEV;

	}

	return 0;

}