[patch 014/108] IMA: Handle dentry_open failures

Greg KH
2009-07-01T00:50:51Z

[-- Attachment #1: ima-handle-dentry_open-failures.patch --]
[-- Type: text/plain, Size: 1356 bytes --]

2.6.30-stable review patch. If anyone has any objections, please let us know.

------------------

From: Eric Paris <eparis@redhat.com>

commit f06dd16a03f6f7f72fab4db03be36e28c28c6fd6 upstream.

Currently IMA does not handle failures from dentry_open(). This means that we
leave a pointer set to ERR_PTR(errno) and then try to use it just a few lines
later in fput(). Oops.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
security/integrity/ima/ima_main.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -128,10 +128,6 @@ static int get_path_measurement(struct i
{
int rc = 0;

- if (IS_ERR(file)) {
- pr_info("%s dentry_open failed\n", filename);
- return rc;
- }
iint->opencount++;
iint->readcount++;

@@ -197,6 +193,12 @@ int ima_path_check(struct path *path, in
struct vfsmount *mnt = mntget(path->mnt);

file = dentry_open(dentry, mnt, O_RDONLY, current_cred());
+ if (IS_ERR(file)) {
+ pr_info("%s dentry_open failed\n", dentry->d_name.name);
+ rc = PTR_ERR(file);
+ file = NULL;
+ goto out;
+ }
rc = get_path_measurement(iint, file, dentry->d_name.name);
}