Revert "Merge tag 'keys-acl-20190703' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Jul 2019 01:43:43 +0000 (18:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Jul 2019 01:43:43 +0000 (18:43 -0700)
commit028db3e290f15ac509084c0fc3b9d021f668f877
tree7497244a90100f2464403063f88f83a555da03b3
parente9a83bd2322035ed9d7dcf35753d3f984d76c6a5
Revert "Merge tag 'keys-acl-20190703' of git://git./linux/kernel/git/dhowells/linux-fs"

This reverts merge 0f75ef6a9cff49ff612f7ce0578bced9d0b38325 (and thus
effectively commits

   7a1ade847596 ("keys: Provide KEYCTL_GRANT_PERMISSION")
   2e12256b9a76 ("keys: Replace uid/gid/perm permissions checking with an ACL")

that the merge brought in).

It turns out that it breaks booting with an encrypted volume, and Eric
biggers reports that it also breaks the fscrypt tests [1] and loading of
in-kernel X.509 certificates [2].

The root cause of all the breakage is likely the same, but David Howells
is off email so rather than try to work it out it's getting reverted in
order to not impact the rest of the merge window.

 [1] https://lore.kernel.org/lkml/20190710011559.GA7973@sol.localdomain/
 [2] https://lore.kernel.org/lkml/20190710013225.GB7973@sol.localdomain/

Link: https://lore.kernel.org/lkml/CAHk-=wjxoeMJfeBahnWH=9zShKp2bsVy527vo3_y8HfOdhwAAw@mail.gmail.com/
Reported-by: Eric Biggers <ebiggers@kernel.org>
Cc: David Howells <dhowells@redhat.com>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
46 files changed:
Documentation/security/keys/core.rst
Documentation/security/keys/request-key.rst
certs/blacklist.c
certs/system_keyring.c
drivers/md/dm-crypt.c
drivers/nvdimm/security.c
fs/afs/security.c
fs/cifs/cifs_spnego.c
fs/cifs/cifsacl.c
fs/cifs/connect.c
fs/crypto/keyinfo.c
fs/ecryptfs/ecryptfs_kernel.h
fs/ecryptfs/keystore.c
fs/fscache/object-list.c
fs/nfs/nfs4idmap.c
fs/ubifs/auth.c
include/linux/key.h
include/uapi/linux/keyctl.h
lib/digsig.c
net/ceph/ceph_common.c
net/dns_resolver/dns_key.c
net/dns_resolver/dns_query.c
net/rxrpc/key.c
net/wireless/reg.c
security/integrity/digsig.c
security/integrity/digsig_asymmetric.c
security/integrity/evm/evm_crypto.c
security/integrity/ima/ima_mok.c
security/integrity/integrity.h
security/integrity/platform_certs/platform_keyring.c
security/keys/compat.c
security/keys/encrypted-keys/encrypted.c
security/keys/encrypted-keys/masterkey_trusted.c
security/keys/gc.c
security/keys/internal.h
security/keys/key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/permission.c
security/keys/persistent.c
security/keys/proc.c
security/keys/process_keys.c
security/keys/request_key.c
security/keys/request_key_auth.c
security/selinux/hooks.c
security/smack/smack_lsm.c