Commit 497ad4be authored by Thorsten Blum's avatar Thorsten Blum Committed by John Johansen
Browse files

apparmor: Use sysfs_emit in param_get_{audit,mode} 



Replace sprintf() with sysfs_emit() in param_get_audit() and
param_get_mode(). sysfs_emit() is preferred for formatting sysfs output
because it provides safer bounds checking.  Add terminating newlines as
suggested by checkpatch.

Signed-off-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent e6a522c5

security/apparmor/lsm.c

+3 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/ptrace.h>

#include <linux/ctype.h>

#include <linux/sysctl.h>

#include <linux/sysfs.h>

#include <linux/audit.h>

#include <linux/user_namespace.h>

#include <linux/netfilter_ipv4.h>
@@ -2064,7 +2065,7 @@ static int param_get_audit(char *buffer, const struct kernel_param *kp) 
		return -EINVAL;

	if (apparmor_initialized && !aa_current_policy_view_capable(NULL))

		return -EPERM;

	return sprintf(buffer, "%s", audit_mode_names[aa_g_audit]);

	return sysfs_emit(buffer, "%s\n", audit_mode_names[aa_g_audit]);

}



static int param_set_audit(const char *val, const struct kernel_param *kp)
@@ -2092,8 +2093,7 @@ static int param_get_mode(char *buffer, const struct kernel_param *kp) 
		return -EINVAL;

	if (apparmor_initialized && !aa_current_policy_view_capable(NULL))

		return -EPERM;



	return sprintf(buffer, "%s", aa_profile_mode_names[aa_g_profile_mode]);

	return sysfs_emit(buffer, "%s\n", aa_profile_mode_names[aa_g_profile_mode]);

}



static int param_set_mode(const char *val, const struct kernel_param *kp)