Revert "UBUNTU: SAUCE: apparmor: fix oops in bind_mnt when dev_path lookup fails"

This reverts commit 024dce0150c767f151c67bea2fba2ce7026a50fa.

BugLink: https://bugs.launchpad.net/bugs/1666897
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
index e78018172eab1066621f3a2298cc2cd558898057..907d3f0a0278b58306e534ef85245c9875cd4d80 100644 (file)
--- a/security/apparmor/mount.c
+++ b/security/apparmor/mount.c
@@ -335,7 +335,6 @@ static int match_mnt_path_str(struct aa_profile *profile, const struct path *mnt
                goto audit;
        if (IS_ERR(devname)) {
                error = PTR_ERR(devname);
-               devname = NULL;
                info = devinfo;
                goto audit;
        }