From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, viro@zeniv.linux.org.uk,
Andi Kleen <ak@linux.intel.com>,
josef@redhat.com, chris.mason@oracle.com
Subject: [PATCH 3/4] BTRFS: Set NOSEC early for btrfs
Date: Fri, 27 May 2011 15:54:04 -0700 [thread overview]
Message-ID: <1306536845-24162-3-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1306536845-24162-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Based on a suggestion from Josef Bacik.
The btrfs inode lookup already does a quick check for xattrs.
If it doesn't find any and the file is not sgid set the NOSEC flag.
This avoids a xattr lookup on the first write.
Cc: josef@redhat.com
Cc: chris.mason@oracle.com
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
fs/btrfs/inode.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 7cd8ab0..b309c30 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2544,8 +2544,11 @@ static void btrfs_read_locked_inode(struct inode *inode)
* any xattrs or acls
*/
maybe_acls = acls_after_inode_item(leaf, path->slots[0], inode->i_ino);
- if (!maybe_acls)
+ if (!maybe_acls) {
cache_no_acl(inode);
+ if (!is_sgid(inode->i_mode))
+ inode->i_flags |= S_NOSEC;
+ }
BTRFS_I(inode)->block_group = btrfs_find_block_group(root, 0,
alloc_group_block, 0);
@@ -4616,6 +4619,8 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
(BTRFS_I(dir)->flags & BTRFS_INODE_NODATACOW))
BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW;
}
+ if (!is_sgid(mode))
+ inode->i_flags |= S_NOSEC;
insert_inode_hash(inode);
inode_tree_add(inode);
--
1.7.4.4
next prev parent reply other threads:[~2011-05-27 22:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-27 22:54 [PATCH 1/4] Cache xattr security drop check for write Andi Kleen
2011-05-27 22:54 ` [PATCH 2/4] EXT4: Set NOSEC flag early when there are no xattrs Andi Kleen
2011-05-28 9:08 ` Marco Stornelli
2011-05-28 11:24 ` Chris Mason
2011-05-28 14:43 ` Andi Kleen
2011-05-27 22:54 ` Andi Kleen [this message]
2011-05-27 22:54 ` [PATCH 4/4] XFS: Set NOSEC flag early when inode has " Andi Kleen
2011-05-28 11:42 ` [PATCH 1/4] Cache xattr security drop check for write Al Viro
2011-05-29 13:52 ` Valdis.Kletnieks
2011-05-29 14:24 ` Andi Kleen
2011-05-29 17:48 ` Valdis.Kletnieks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1306536845-24162-3-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=chris.mason@oracle.com \
--cc=josef@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox