Commit c8b4ec83 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fscrypt-for-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt 

Pull fscrypt fixes from Ted Ts'o:
 "Two fscrypt bug fixes, one of which was unmasked by an update to the
  crypto tree during the merge window"

* tag 'fscrypt-for-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
  fscrypt: fix renaming and linking special files
  fscrypt: fix the test_dummy_encryption mount option
parents da287567 42d97eb0

fs/crypto/keyinfo.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -248,7 +248,8 @@ retry: 
		goto out;

		goto out;





	if (fscrypt_dummy_context_enabled(inode)) {

	if (fscrypt_dummy_context_enabled(inode)) {

		memset(raw_key, 0x42, FS_AES_256_XTS_KEY_SIZE);

		memset(raw_key, 0x42, keysize/2);

		memset(raw_key+keysize/2, 0x24, keysize - (keysize/2));

		goto got_key;

		goto got_key;

	}

	}

fs/crypto/policy.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -179,6 +179,11 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child) 
		BUG_ON(1);

		BUG_ON(1);

	}

	}





	/* No restrictions on file types which are never encrypted */

	if (!S_ISREG(child->i_mode) && !S_ISDIR(child->i_mode) &&

	    !S_ISLNK(child->i_mode))

		return 1;



	/* no restrictions if the parent directory is not encrypted */

	/* no restrictions if the parent directory is not encrypted */

	if (!parent->i_sb->s_cop->is_encrypted(parent))

	if (!parent->i_sb->s_cop->is_encrypted(parent))

		return 1;

		return 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE