Message ID | 1480627271-10441-11-git-send-email-richard@nod.at (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
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;
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 <richard@nod.at> --- fs/ubifs/xattr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)