All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] ext4: skip ext4_init_security() and encryption on ea_inodes
@ 2017-07-06  2:38 Tahsin Erdogan
  2017-07-06  2:38 ` [PATCH 2/2] ext4: fix __ext4_new_inode() journal credits calculation Tahsin Erdogan
  0 siblings, 1 reply; 8+ messages in thread
From: Tahsin Erdogan @ 2017-07-06  2:38 UTC (permalink / raw)
  To: Theodore Ts'o, Jaegeuk Kim, Andreas Dilger, linux-fscrypt,
	linux-ext4
  Cc: linux-kernel, Tahsin Erdogan

Extended attribute inodes are internal to ext4. Adding encryption/security
related attributes on them would mean dealing with nested calls into ea code.
Since they have no direct exposure to user mode, just avoid creating ea
entries for them.

Signed-off-by: Tahsin Erdogan <tahsin@google.com>
---
 fs/ext4/ialloc.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index fb1b3df17f6e..0c79e3efcaf7 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -771,7 +771,8 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
 
 	if ((ext4_encrypted_inode(dir) ||
 	     DUMMY_ENCRYPTION_ENABLED(EXT4_SB(dir->i_sb))) &&
-	    (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))) {
+	    (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)) &&
+	    !(i_flags & EXT4_EA_INODE_FL)) {
 		err = fscrypt_get_encryption_info(dir);
 		if (err)
 			return ERR_PTR(err);
@@ -1114,11 +1115,11 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
 		err = ext4_init_acl(handle, inode, dir);
 		if (err)
 			goto fail_free_drop;
-	}
 
-	err = ext4_init_security(handle, inode, dir, qstr);
-	if (err)
-		goto fail_free_drop;
+		err = ext4_init_security(handle, inode, dir, qstr);
+		if (err)
+			goto fail_free_drop;
+	}
 
 	if (ext4_has_feature_extents(sb)) {
 		/* set extent flag only for directory, file and normal symlink*/
-- 
2.13.2.725.g09c95d1e9-goog

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2017-07-17 14:42 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-06  2:38 [PATCH 1/2] ext4: skip ext4_init_security() and encryption on ea_inodes Tahsin Erdogan
2017-07-06  2:38 ` [PATCH 2/2] ext4: fix __ext4_new_inode() journal credits calculation Tahsin Erdogan
2017-07-08  5:09   ` Theodore Ts'o
2017-07-08 15:30     ` More thoughts about xattrs, journal credits, and their location Theodore Ts'o
2017-07-09 20:01       ` Tahsin Erdogan
2017-07-10 15:32         ` Theodore Ts'o
     [not found]         ` <522BF129-AE45-4722-BCC3-0DDC6A078EB8@dilger.ca>
2017-07-14 22:13           ` Andreas Dilger
2017-07-17 14:42             ` Jan Kara

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.