From 700eada82a349f0aeadd43ce4b182b32e4adc5b5 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Thu, 29 Sep 2016 20:11:03 +0200 Subject: [PATCH] ubifs: Massage assert in ubifs_xattr_set() wrt. fscrypto When we're creating a new inode in UBIFS the inode is not yet exposed and fscrypto calls ubifs_xattr_set() without holding the inode mutex. This is okay but ubifs_xattr_set() has to know about this. Signed-off-by: Richard Weinberger --- fs/ubifs/xattr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c index 77ffc9788f45..da59ea3b50c4 100644 --- a/fs/ubifs/xattr.c +++ b/fs/ubifs/xattr.c @@ -289,7 +289,13 @@ int ubifs_xattr_set(struct inode *host, const char *name, const void *value, union ubifs_key key; int err; - ubifs_assert(inode_is_locked(host)); + /* + * Creating an encryption context is done unlocked since we + * operate on a new inode which is not visible to other users + * at this point. + */ + if (strcmp(name, UBIFS_XATTR_NAME_ENCRYPTION_CONTEXT) != 0) + ubifs_assert(inode_is_locked(host)); if (size > UBIFS_MAX_INO_DATA) return -ERANGE; -- 2.20.1