commit ca4bd5ae0ae4b7afffbd807d923ea76934512a82
author John Johansen <john.johansen@canonical.com> Mon Jan 16 00:43:11 2017 -0800
committer John Johansen <john.johansen@canonical.com> Mon Jan 16 01:18:53 2017 -0800
tree 61bae584086d55011d3ae9a49bfaf6074b05eba4
parent d4669f0b036efd67ec2e00e0adc8f42214c1bdf8

apparmor: add check for apparmor enabled in module parameters missing it

Signed-off-by: John Johansen <john.johansen@canonical.com>

security/apparmor/lsm.c

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index c249ea0..fc82ac0 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -750,6 +750,8 @@
 {
 	if (!policy_view_capable(NULL))
 		return -EPERM;
+	if (!apparmor_enabled)
+		return -EINVAL;
 	return param_get_bool(buffer, kp);
 }
 
@@ -757,6 +759,8 @@
 {
 	if (!policy_admin_capable(NULL))
 		return -EPERM;
+	if (!apparmor_enabled)
+		return -EINVAL;
 	return param_set_bool(val, kp);
 }
 
@@ -764,6 +768,8 @@
 {
 	if (!policy_view_capable(NULL))
 		return -EPERM;
+	if (!apparmor_enabled)
+		return -EINVAL;
 	return param_get_bool(buffer, kp);
 }
 
@@ -771,6 +777,8 @@
 {
 	if (!policy_admin_capable(NULL))
 		return -EPERM;
+	if (!apparmor_enabled)
+		return -EINVAL;
 	return param_set_uint(val, kp);
 }
 
@@ -778,6 +786,8 @@
 {
 	if (!policy_view_capable(NULL))
 		return -EPERM;
+	if (!apparmor_enabled)
+		return -EINVAL;
 	return param_get_uint(buffer, kp);
 }