From 77e93ca8598c4a13d633f56699a53e8467754a46 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Mon, 11 May 2009 13:59:16 -0400 Subject: [PATCH] --- yaml --- r: 146425 b: refs/heads/master c: f06dd16a03f6f7f72fab4db03be36e28c28c6fd6 h: refs/heads/master i: 146423: d49f0b14867f0a6527de4d7a553e4b26150ff297 v: v3 --- [refs] | 2 +- trunk/security/integrity/ima/ima_main.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 34c2ccc6f8a1..ffce89adbcec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37bcbf13d32e4e453e9def79ee72bd953b88302f +refs/heads/master: f06dd16a03f6f7f72fab4db03be36e28c28c6fd6 diff --git a/trunk/security/integrity/ima/ima_main.c b/trunk/security/integrity/ima/ima_main.c index cdae13c5ae05..1987424623c2 100644 --- a/trunk/security/integrity/ima/ima_main.c +++ b/trunk/security/integrity/ima/ima_main.c @@ -116,10 +116,6 @@ static int get_path_measurement(struct ima_iint_cache *iint, struct file *file, { int rc = 0; - if (IS_ERR(file)) { - pr_info("%s dentry_open failed\n", filename); - return rc; - } iint->opencount++; iint->readcount++; @@ -185,6 +181,12 @@ int ima_path_check(struct path *path, int mask) 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); } out: