From: Ben Hutchings <ben@decadent.org.uk>
To: "zhangyi (F)" <yi.zhang@huawei.com>, gregkh@linuxfoundation.org
Cc: stable@vger.kernel.org, viro@zeniv.linux.org.uk,
linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH for linux 4.4.y/3.16.y] fs/dcache: move security_d_instantiate() behind attaching dentry to inode
Date: Tue, 17 Dec 2019 00:27:22 +0000 [thread overview]
Message-ID: <ff051a95512a6463dc0588e285557f79ee98c8f0.camel@decadent.org.uk> (raw)
In-Reply-To: <20191106094352.9665-1-yi.zhang@huawei.com>
[-- Attachment #1: Type: text/plain, Size: 2747 bytes --]
On Wed, 2019-11-06 at 17:43 +0800, zhangyi (F) wrote:
> During backport 1e2e547a93a "do d_instantiate/unlock_new_inode
> combinations safely", there was a error instantiating sequence of
> attaching dentry to inode and calling security_d_instantiate().
>
> Before commit ce23e640133 "->getxattr(): pass dentry and inode as
> separate arguments" and b96809173e9 "security_d_instantiate(): move to
> the point prior to attaching dentry to inode", security_d_instantiate()
> should be called beind __d_instantiate(), otherwise it will trigger
> below problem when CONFIG_SECURITY_SMACK on ext4 was enabled because
> d_inode(dentry) used by ->getxattr() is NULL before __d_instantiate()
> instantiate inode.
Thanks, I've queued this up for 3.16.
Ben.
> [ 31.858026] BUG: unable to handle kernel paging request at ffffffffffffff70
> ...
> [ 31.882024] Call Trace:
> [ 31.882378] [<ffffffffa347f75c>] ext4_xattr_get+0x8c/0x3e0
> [ 31.883195] [<ffffffffa3489454>] ext4_xattr_security_get+0x24/0x40
> [ 31.884086] [<ffffffffa336a56b>] generic_getxattr+0x5b/0x90
> [ 31.884907] [<ffffffffa3700514>] smk_fetch+0xb4/0x150
> [ 31.885634] [<ffffffffa3700772>] smack_d_instantiate+0x1c2/0x550
> [ 31.886508] [<ffffffffa36f9a5a>] security_d_instantiate+0x3a/0x80
> [ 31.887389] [<ffffffffa3353b26>] d_instantiate_new+0x36/0x130
> [ 31.888223] [<ffffffffa342b1ef>] ext4_mkdir+0x4af/0x6a0
> [ 31.888928] [<ffffffffa3343470>] vfs_mkdir+0x100/0x280
> [ 31.889536] [<ffffffffa334b086>] SyS_mkdir+0xb6/0x170
> [ 31.890255] [<ffffffffa307c855>] ? trace_do_page_fault+0x95/0x2b0
> [ 31.891134] [<ffffffffa3c5e078>] entry_SYSCALL_64_fastpath+0x18/0x73
>
> Cc: <stable@vger.kernel.org> # 3.16, 4.4
> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
> ---
> fs/dcache.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/dcache.c b/fs/dcache.c
> index 5a1c36dc5d65..baa00718d8d1 100644
> --- a/fs/dcache.c
> +++ b/fs/dcache.c
> @@ -1900,7 +1900,6 @@ void d_instantiate_new(struct dentry *entry, struct inode *inode)
> BUG_ON(!hlist_unhashed(&entry->d_u.d_alias));
> BUG_ON(!inode);
> lockdep_annotate_inode_mutex_key(inode);
> - security_d_instantiate(entry, inode);
> spin_lock(&inode->i_lock);
> __d_instantiate(entry, inode);
> WARN_ON(!(inode->i_state & I_NEW));
> @@ -1908,6 +1907,7 @@ void d_instantiate_new(struct dentry *entry, struct inode *inode)
> smp_mb();
> wake_up_bit(&inode->i_state, __I_NEW);
> spin_unlock(&inode->i_lock);
> + security_d_instantiate(entry, inode);
> }
> EXPORT_SYMBOL(d_instantiate_new);
>
--
Ben Hutchings
If the facts do not conform to your theory, they must be disposed of.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
prev parent reply other threads:[~2019-12-17 0:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 9:43 [PATCH for linux 4.4.y/3.16.y] fs/dcache: move security_d_instantiate() behind attaching dentry to inode zhangyi (F)
2019-11-08 17:36 ` Greg KH
2019-12-17 0:27 ` Ben Hutchings [this message]
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=ff051a95512a6463dc0588e285557f79ee98c8f0.camel@decadent.org.uk \
--to=ben@decadent.org.uk \
--cc=gregkh@linuxfoundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=yi.zhang@huawei.com \
/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;
as well as URLs for NNTP newsgroup(s).