From: Janne Karhunen <janne.karhunen@gmail.com>
To: linux-integrity@vger.kernel.org,
linux-security-module@vger.kernel.org, zohar@linux.ibm.com,
linux-mm@kvack.org, viro@zeniv.linux.org.uk
Cc: Janne Karhunen <janne.karhunen@gmail.com>,
Konsta Karsisto <konsta.karsisto@gmail.com>
Subject: [PATCH 2/3] ima: update the file measurement on truncate
Date: Mon, 2 Sep 2019 12:45:39 +0300 [thread overview]
Message-ID: <20190902094540.12786-2-janne.karhunen@gmail.com> (raw)
In-Reply-To: <20190902094540.12786-1-janne.karhunen@gmail.com>
Let IMA know when a file is being opened with truncate
or truncated directly.
Depends on commit 72649b7862a7 ("ima: keep the integrity state of open files up to date")'
Signed-off-by: Janne Karhunen <janne.karhunen@gmail.com>
Signed-off-by: Konsta Karsisto <konsta.karsisto@gmail.com>
---
fs/namei.c | 5 ++++-
fs/open.c | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/fs/namei.c b/fs/namei.c
index 209c51a5226c..0994fe26bef1 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3418,8 +3418,11 @@ static int do_last(struct nameidata *nd,
goto out;
opened:
error = ima_file_check(file, op->acc_mode);
- if (!error && will_truncate)
+ if (!error && will_truncate) {
error = handle_truncate(file);
+ if (!error)
+ ima_file_update(file);
+ }
out:
if (unlikely(error > 0)) {
WARN_ON(1);
diff --git a/fs/open.c b/fs/open.c
index a59abe3c669a..98c2d4629371 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -63,6 +63,9 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
/* Note any delegations or leases have already been broken: */
ret = notify_change(dentry, &newattrs, NULL);
inode_unlock(dentry->d_inode);
+
+ if (filp)
+ ima_file_update(filp);
return ret;
}
--
2.17.1
next prev parent reply other threads:[~2019-09-02 9:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-02 9:45 [PATCH 1/3] ima: keep the integrity state of open files up to date Janne Karhunen
2019-09-02 9:45 ` Janne Karhunen [this message]
2019-09-08 15:38 ` [PATCH 2/3] ima: update the file measurement on truncate Mimi Zohar
2019-09-02 9:45 ` [PATCH 3/3] ima: update the file measurement on writes Janne Karhunen
2019-09-08 17:07 ` Mimi Zohar
2019-09-02 11:31 ` [PATCH 1/3] ima: keep the integrity state of open files up to date kbuild test robot
2019-09-02 12:57 ` kbuild test robot
2019-09-08 16:35 ` Mimi Zohar
2019-09-09 21:39 ` Eric Biggers
2019-09-10 7:04 ` Janne Karhunen
2019-09-15 20:24 ` Eric Biggers
2019-09-16 11:45 ` Janne Karhunen
2019-09-17 4:23 ` Eric Biggers
2019-09-17 7:24 ` Janne Karhunen
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=20190902094540.12786-2-janne.karhunen@gmail.com \
--to=janne.karhunen@gmail.com \
--cc=konsta.karsisto@gmail.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-security-module@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--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).