]> git.baikalelectronics.ru Git - kernel.git/commit
fscrypt: use smp_load_acquire() for ->s_master_keys
authorEric Biggers <ebiggers@google.com>
Tue, 21 Jul 2020 22:59:18 +0000 (15:59 -0700)
committerEric Biggers <ebiggers@google.com>
Tue, 21 Jul 2020 23:02:13 +0000 (16:02 -0700)
commite9138ceb695dc10b54790539acbef6e654ce2b30
treea213425e6dcd1cacf1f37b086b186d0743ddee5b
parentd13ea373f611ccfaafa43e943055fad34a97a6d9
fscrypt: use smp_load_acquire() for ->s_master_keys

Normally smp_store_release() or cmpxchg_release() is paired with
smp_load_acquire().  Sometimes smp_load_acquire() can be replaced with
the more lightweight READ_ONCE().  However, for this to be safe, all the
published memory must only be accessed in a way that involves the
pointer itself.  This may not be the case if allocating the object also
involves initializing a static or global variable, for example.

super_block::s_master_keys is a keyring, which is internal to and is
allocated by the keyrings subsystem.  By using READ_ONCE() for it, we're
relying on internal implementation details of the keyrings subsystem.

Remove this fragile assumption by using smp_load_acquire() instead.

(Note: I haven't seen any real-world problems here.  This change is just
fixing the code to be guaranteed correct and less fragile.)

Fixes: 528f49bd1cab ("fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl")
Link: https://lore.kernel.org/r/20200721225920.114347-4-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
fs/crypto/keyring.c