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

Commit 9dc3f7f1 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fscrypt: Handle support for v1 encryption policy"

parents f848f96f 91a68a88

fs/crypto/keyring.c

+2 −1
Original line number Diff line number Diff line
@@ -670,7 +670,8 @@ int fscrypt_ioctl_add_key(struct file *filp, void __user *_uarg) 
	if (arg.__flags) {

		if (arg.__flags & ~__FSCRYPT_ADD_KEY_FLAG_HW_WRAPPED)

			return -EINVAL;

		if (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_IDENTIFIER)

		if ((arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_IDENTIFIER) &&

		    (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR))

			return -EINVAL;

		secret.is_hw_wrapped = true;

	}