IMA: Handle dentry_open failures

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>

diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 2bfad5770a24c8ce0b46f9d705a72a3d9f3d6ba3..4ed0c35dda5fed0e756ba9f67637c46b97a0a26e 100644 (file)
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -128,10 +128,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++;
 
@@ -197,6 +193,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: