diff mbox

[07/14] UBUNTU: SAUCE: apparmor: fix not handling error case when securityfs_pin_fs() fails

Message ID 20170201091310.22695-8-john.johansen@canonical.com
State New
Headers show

Commit Message

John Johansen Feb. 1, 2017, 9:13 a.m. UTC 
BugLink: http://bugs.launchpad.net/bugs/1660842
Signed-off-by: John Johansen <john.johansen@canonical.com>
---
 security/apparmor/apparmorfs.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index b8ba1bb..019dba8 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -1049,8 +1049,10 @@  static int ns_mkdir_op(struct inode *dir, struct dentry *dentry, umode_t mode)
 	 * for pin_fs
 	 */
 	inode_unlock(dir);
-	securityfs_pin_fs();
+	error = securityfs_pin_fs();
 	inode_lock_nested(dir, I_MUTEX_PARENT);
+	if (error)
+		return error;
 
 	error = __securityfs_setup_d_inode(dir, dentry, mode | S_IFDIR,  NULL,
 					   NULL, NULL);