[Trusty][PATCH] UBUNTU: SAUCE: apparmor: delete extra variable dev_path

Luis Henriques luis.henriques at canonical.com
Wed Nov 23 22:55:49 UTC 2016


BugLink: https://bugs.launchpad.net/bugs/1644302

Commit 74a2b3a08798 ("UBUNTU: SAUCE: apparmor: fix sleep in critical section")
introduced a regression by not deleting a local variable dev_path, shadowing
another variable with broader scope and preventing it from being initialised.

This patch simply deletes the extra struct path dev_path variable.

Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 security/apparmor/mount.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
index 076200ece0f5..f59937529ba4 100644
--- a/security/apparmor/mount.c
+++ b/security/apparmor/mount.c
@@ -517,8 +517,6 @@ int aa_new_mount(struct aa_label *label, const char *orig_dev_name,
 		put_filesystem(fstype);
 
 		if (requires_dev) {
-			struct path dev_path;
-
 			if (!dev_name || !*dev_name) {
 				error = -ENOENT;
 				goto out;




More information about the kernel-team mailing list