From: Mimi Zohar <zohar@linux.ibm.com>
To: xiujianfeng <xiujianfeng@huawei.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: Mon, 30 Jan 2023 07:17:35 -0500 [thread overview]
Message-ID: <9c6826bb7e5aa85be06865f5a2bed0e30b4ad33e.camel@linux.ibm.com> (raw)
In-Reply-To: <c95487db-f304-2610-5e93-41d7b39934d7@huawei.com>
[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
next prev parent reply other threads:[~2023-01-30 12:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-29 0:46 Xiu Jianfeng
2023-01-29 16:15 ` Mimi Zohar
2023-01-30 4:02 ` xiujianfeng
2023-01-30 12:17 ` Mimi Zohar [this message]
2023-01-31 2:05 ` xiujianfeng
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=9c6826bb7e5aa85be06865f5a2bed0e30b4ad33e.camel@linux.ibm.com \
--to=zohar@linux.ibm.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=xiujianfeng@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
all inboxes | Powered by JetHome®