From: xiujianfeng <xiujianfeng@huawei.com>
To: Mimi Zohar <zohar@linux.ibm.com>, <dmitry.kasatkin@gmail.com>,
<paul@paul-moore.com>, <jmorris@namei.org>, <serge@hallyn.com>,
Christian Brauner b <brauner@kernel.org>
Cc: <linux-integrity@vger.kernel.org>,
<linux-security-module@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH -next] evm: call dump_security_xattr() in all cases to remove code duplication
Date: Tue, 31 Jan 2023 10:05:22 +0800 [thread overview]
Message-ID: <29f45743-ba43-c2ec-4494-7253170ab9ce@huawei.com> (raw)
In-Reply-To: <9c6826bb7e5aa85be06865f5a2bed0e30b4ad33e.camel@linux.ibm.com>
On 2023/1/30 20:17, Mimi Zohar wrote:
> [Cc: Christian Brauner <brauner@kernel.org>]
>
> On Mon, 2023-01-30 at 12:02 +0800, xiujianfeng wrote:
>> Hi,
>>
>> On 2023/1/30 0:15, Mimi Zohar wrote:
>>>> @@ -254,15 +264,9 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
>>>> if (is_ima)
>>>> ima_present = true;
>>>>
>>>> - if (req_xattr_value_len < 64)
>>>> - pr_debug("%s: (%zu) [%*phN]\n", req_xattr_name,
>>>> - req_xattr_value_len,
>>>> - (int)req_xattr_value_len,
>>>> - req_xattr_value);
>>>> - else
>>>> - dump_security_xattr(req_xattr_name,
>>>> - req_xattr_value,
>>>> - req_xattr_value_len);
>>>> + dump_security_xattr(req_xattr_name,
>>>> + req_xattr_value,
>>>> + req_xattr_value_len);
>>>> continue;
>>>> }
>>>> size = vfs_getxattr_alloc(&nop_mnt_idmap, dentry, xattr->name,
>>>
>>> Hm, this patch doesn't apply properly.
>>
>> I noticed that the patch fails to apply on linux master, however this
>> patch is meant for linux-next, would you please maybe have a look?
>
> I wasn't aware of the change. However, merge conflicts should not be
> "fixed", but mentioned immediately after the patch break line ("---") .
> FYI, this merge conflict is a result of commit 4609e1f18e19 ("fs: port
> ->permission() to pass mnt_idmap").
>
> Patches for the linux-integrity branch should be based on the next-
> integrity branch.
Thanks mimi, I assume you mean next-integrity branch on
https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git/,
new patch already sent.
next prev parent reply other threads:[~2023-01-31 2:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-29 0:46 [PATCH -next] evm: call dump_security_xattr() in all cases to remove code duplication Xiu Jianfeng
2023-01-29 16:15 ` Mimi Zohar
2023-01-30 4:02 ` xiujianfeng
2023-01-30 12:17 ` Mimi Zohar
2023-01-31 2:05 ` xiujianfeng [this message]
2023-01-31 2:00 Xiu Jianfeng
2023-01-31 2:11 ` xiujianfeng
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=29f45743-ba43-c2ec-4494-7253170ab9ce@huawei.com \
--to=xiujianfeng@huawei.com \
--cc=brauner@kernel.org \
--cc=dmitry.kasatkin@gmail.com \
--cc=jmorris@namei.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=serge@hallyn.com \
--cc=zohar@linux.ibm.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).