From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Sat, 14 May 2022 11:00:22 +0000 (-0400)
Subject: bcachefs: Switch to key_type_user, not logon
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=232697ab9ded81d56afa8a2e47edb48deea5f9e6;p=linux.git

bcachefs: Switch to key_type_user, not logon

The only difference key_type_logon and key_type_user is that
key_type_logon keys can't be read by userspace.

However, userspace has actually been adding keys to both the logon and
user keychains, because userspace fsck requires the keychain interface -
so we might as well just use user and drop the logon keychain.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
---

diff --git a/fs/bcachefs/checksum.c b/fs/bcachefs/checksum.c
index 425582f60d7a8..50157b4013a5d 100644
--- a/fs/bcachefs/checksum.c
+++ b/fs/bcachefs/checksum.c
@@ -424,7 +424,7 @@ static int __bch2_request_key(char *key_description, struct bch_key *key)
 	const struct user_key_payload *ukp;
 	int ret;
 
-	keyring_key = request_key(&key_type_logon, key_description, NULL);
+	keyring_key = request_key(&key_type_user, key_description, NULL);
 	if (IS_ERR(keyring_key))
 		return PTR_ERR(keyring_key);