]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ovl: fix NULL pointer dereference in copy up warning
authorChristoph Fritz <chf.fritz@googlemail.com>
Wed, 12 Jan 2022 18:33:21 +0000 (19:33 +0100)
committerPaolo Pisati <paolo.pisati@canonical.com>
Thu, 10 Feb 2022 14:22:38 +0000 (15:22 +0100)
BugLink: https://bugs.launchpad.net/bugs/1960509
commit 4ee7e4a6c9b298da44029ed9ec8ed23ae49cc209 upstream.

This patch is fixing a NULL pointer dereference to get a recently
introduced warning message working.

Fixes: 5b0a414d06c3 ("ovl: fix filattr copy-up failure")
Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Cc: <stable@vger.kernel.org> # v5.15
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
fs/overlayfs/copy_up.c

index 791b1916b098da1718db7aa30851df4c844e90cf..e040970408d4ff2b57c3e64518961eacbf66113a 100644 (file)
@@ -145,7 +145,7 @@ static int ovl_copy_fileattr(struct inode *inode, struct path *old,
                if (err == -ENOTTY || err == -EINVAL)
                        return 0;
                pr_warn("failed to retrieve lower fileattr (%pd2, err=%i)\n",
-                       old, err);
+                       old->dentry, err);
                return err;
        }
 
@@ -178,7 +178,7 @@ static int ovl_copy_fileattr(struct inode *inode, struct path *old,
                        return 0;
                }
                pr_warn("failed to retrieve upper fileattr (%pd2, err=%i)\n",
-                       new, err);
+                       new->dentry, err);
                return err;
        }