diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-09-26 17:20:39 -0400 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:15 -0400 |
commit | 1ee608c65d652af30cf69eaca425d8a5c06712d7 (patch) | |
tree | 5d76280c8981f3a45ace0725be6385affa9810f2 /fs/bcachefs/checksum.c | |
parent | d281701b00fc857755cd0fc08a415a694d5f49c0 (diff) | |
download | linux-1ee608c65d652af30cf69eaca425d8a5c06712d7.tar.gz linux-1ee608c65d652af30cf69eaca425d8a5c06712d7.tar.bz2 linux-1ee608c65d652af30cf69eaca425d8a5c06712d7.zip |
bcachefs: Fall back to requesting passphrase directly
We can only do this in userspace, unfortunately - but kernel keyrings
have never seemed to worked reliably, this is a useful fallback.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/checksum.c')
-rw-r--r-- | fs/bcachefs/checksum.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/fs/bcachefs/checksum.c b/fs/bcachefs/checksum.c index 1948119edbf4..50bf4a58f37d 100644 --- a/fs/bcachefs/checksum.c +++ b/fs/bcachefs/checksum.c @@ -535,15 +535,30 @@ static int __bch2_request_key(char *key_description, struct bch_key *key) key_serial_t key_id; key_id = request_key("user", key_description, NULL, + KEY_SPEC_SESSION_KEYRING); + if (key_id >= 0) + goto got_key; + + key_id = request_key("user", key_description, NULL, KEY_SPEC_USER_KEYRING); - if (key_id < 0) - return -errno; + if (key_id >= 0) + goto got_key; + + key_id = request_key("user", key_description, NULL, + KEY_SPEC_USER_SESSION_KEYRING); + if (key_id >= 0) + goto got_key; + + return -errno; +got_key: if (keyctl_read(key_id, (void *) key, sizeof(*key)) != sizeof(*key)) return -1; return 0; } + +#include "../crypto.h" #endif int bch2_request_key(struct bch_sb *sb, struct bch_key *key) @@ -556,6 +571,20 @@ int bch2_request_key(struct bch_sb *sb, struct bch_key *key) ret = __bch2_request_key(key_description.buf, key); printbuf_exit(&key_description); + +#ifndef __KERNEL__ + if (ret) { + char *passphrase = read_passphrase("Enter passphrase: "); + struct bch_encrypted_key sb_key; + + bch2_passphrase_check(sb, passphrase, + key, &sb_key); + ret = 0; + } +#endif + + /* stash with memfd, pass memfd fd to mount */ + return ret; } |