Merge tag 'apparmor-pr-2019-03-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

torvalds · torvalds · commit 8636b1dbce85 · 2019-03-13T11:07:36.000-07:00
Pull apparmor fixes from John Johansen:

 - fix double when failing to unpack secmark rules in policy

 - fix leak of dentry when profile is removed

* tag 'apparmor-pr-2019-03-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: fix double free when unpack of secmark rules fails
  apparmor: delete the dentry in aafs_remove() to avoid a leak
  apparmor: Fix warning about unused function apparmor_ipv6_postroute
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
@@ -356,6 +356,7 @@ static void aafs_remove(struct dentry *dentry)
 			simple_rmdir(dir, dentry);
 		else
 			simple_unlink(dir, dentry);
+		d_delete(dentry);
 		dput(dentry);
 	}
 	inode_unlock(dir);
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
@@ -579,6 +579,7 @@ static bool unpack_secmark(struct aa_ext *e, struct aa_profile *profile)
 			kfree(profile->secmark[i].label);
 		kfree(profile->secmark);
 		profile->secmark_count = 0;
+		profile->secmark = NULL;
 	}
 
 	e->pos = pos;

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,7 @@ static void aafs_remove(struct dentry *dentry)`
`356`	`356`	`simple_rmdir(dir, dentry);`
`357`	`357`	`else`
`358`	`358`	`simple_unlink(dir, dentry);`
	`359`	`+ d_delete(dentry);`
`359`	`360`	`dput(dentry);`
`360`	`361`	`}`
`361`	`362`	`inode_unlock(dir);`
Original file line number	Diff line number	Diff line change
`@@ -579,6 +579,7 @@ static bool unpack_secmark(struct aa_ext e, struct aa_profile profile)`
`579`	`579`	`kfree(profile->secmark[i].label);`
`580`	`580`	`kfree(profile->secmark);`
`581`	`581`	`profile->secmark_count = 0;`
	`582`	`+ profile->secmark = NULL;`
`582`	`583`	`}`
`583`	`584`
`584`	`585`	`e->pos = pos;`