[11/11] UBUNTU: SAUCE: apparmor: fix link auditing failure due to, uninitialized var

Message ID 20170331125744.16986-12-john.johansen@canonical.com
State New
Headers show

Commit Message

John Johansen March 31, 2017, 12:57 p.m.
The lperms struct is uninitialized for use with auditing if there is
an early failure due to a path name error. This can result in incorrect
logging or in the extreme case apparmor killing the task with a signal
which results in the failure in the referenced bug.

BugLink: http://bugs.launchpad.net/bugs/1664912
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
---
 security/apparmor/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index 546f768..ed309ed 100644
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -374,7 +374,7 @@  static int profile_path_link(struct aa_profile *profile,
 			     struct path_cond *cond)
 {
 	const char *lname, *tname = NULL;
-	struct aa_perms lperms, perms;
+	struct aa_perms lperms = {}, perms;
 	const char *info = NULL;
 	u32 request = AA_MAY_LINK;
 	unsigned int state;