From: Richard Weinberger <richard@nod.at>
Date: Thu, 29 Sep 2016 18:11:03 +0000 (+0200)
Subject: ubifs: Massage assert in ubifs_xattr_set() wrt. fscrypto
X-Git-Tag: v5.15~12248^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=700eada82a349f0aeadd43ce4b182b32e4adc5b5;p=platform%2Fkernel%2Flinux-starfive.git

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 <richard@nod.at>
---

diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index 77ffc97..da59ea3 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;