Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1534465

[PATCH 10/24] ubifs: Massage assert in ubifs_xattr_set() wrt. fscrypto

From Richard Weinberger <richard@nod.at>
Newsgroups linux.kernel
Subject [PATCH 10/24] ubifs: Massage assert in ubifs_xattr_set() wrt. fscrypto
Date 2016-12-01 22:30 +0100
Message-ID <sJH5x-2mT-63@gated-at.bofh.it> (permalink)
References <sJH5w-2mT-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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(-)

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.7.3

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 00/24] UBIFS File Encryption v2 Richard Weinberger <richard@nod.at> - 2016-12-01 22:30 +0100
  [PATCH 10/24] ubifs: Massage assert in ubifs_xattr_set() wrt. fscrypto Richard Weinberger <richard@nod.at> - 2016-12-01 22:30 +0100
  [PATCH 06/24] ubifs: Implement directory open operation Richard Weinberger <richard@nod.at> - 2016-12-01 22:30 +0100
  [PATCH 12/24] ubifs: Introduce new data node field, compr_size Richard Weinberger <richard@nod.at> - 2016-12-01 22:30 +0100
  [PATCH 09/24] ubifs: Preload crypto context in ->lookup() Richard Weinberger <richard@nod.at> - 2016-12-01 22:30 +0100

csiph-web