Commit ff73c2c0 authored by Eric Biggers's avatar Eric Biggers

fscrypt: avoid data race on fscrypt_mode::logged_impl_name

The access to logged_impl_name is technically a data race, which tools
like KCSAN could complain about in the future.  See:
https://github.com/google/ktsan/wiki/READ_ONCE-and-WRITE_ONCE

Fix by using xchg(), which also ensures that only one thread does the
logging.

This also required switching from bool to int, to avoid a build error on
the RISC-V architecture which doesn't implement xchg on bytes.
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 065ab4c4
...@@ -435,7 +435,7 @@ struct fscrypt_mode { ...@@ -435,7 +435,7 @@ struct fscrypt_mode {
const char *cipher_str; const char *cipher_str;
int keysize; int keysize;
int ivsize; int ivsize;
bool logged_impl_name; int logged_impl_name;
}; };
static inline bool static inline bool
......
...@@ -81,15 +81,13 @@ struct crypto_skcipher *fscrypt_allocate_skcipher(struct fscrypt_mode *mode, ...@@ -81,15 +81,13 @@ struct crypto_skcipher *fscrypt_allocate_skcipher(struct fscrypt_mode *mode,
mode->cipher_str, PTR_ERR(tfm)); mode->cipher_str, PTR_ERR(tfm));
return tfm; return tfm;
} }
if (unlikely(!mode->logged_impl_name)) { if (!xchg(&mode->logged_impl_name, 1)) {
/* /*
* fscrypt performance can vary greatly depending on which * fscrypt performance can vary greatly depending on which
* crypto algorithm implementation is used. Help people debug * crypto algorithm implementation is used. Help people debug
* performance problems by logging the ->cra_driver_name the * performance problems by logging the ->cra_driver_name the
* first time a mode is used. Note that multiple threads can * first time a mode is used.
* race here, but it doesn't really matter.
*/ */
mode->logged_impl_name = true;
pr_info("fscrypt: %s using implementation \"%s\"\n", pr_info("fscrypt: %s using implementation \"%s\"\n",
mode->friendly_name, mode->friendly_name,
crypto_skcipher_alg(tfm)->base.cra_driver_name); crypto_skcipher_alg(tfm)->base.cra_driver_name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment