linux-next: manual merge of the apparmor tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the apparmor tree got a conflict in:

  security/apparmor/lsm.c

between commit:

  e33c1b992377 ("apparmor: Restore Y/N in /sys for apparmor's "enabled"")

from Linus' tree and commit:

  876dd866c084 ("apparmor: Initial implementation of raw policy blob compression")

from the apparmor tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc security/apparmor/lsm.c
index 87500bde5a92,e1e9c3c01cd3..000000000000
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@@ -25,8 -25,8 +25,9 @@@
  #include <linux/user_namespace.h>
  #include <linux/netfilter_ipv4.h>
  #include <linux/netfilter_ipv6.h>
+ #include <linux/zlib.h>
  #include <net/sock.h>
 +#include <uapi/linux/mount.h>
  
  #include "include/apparmor.h"
  #include "include/apparmorfs.h"
@@@ -1420,46 -1424,37 +1436,77 @@@ static int param_get_aauint(char *buffe
  	return param_get_uint(buffer, kp);
  }
  
 +/* Can only be set before AppArmor is initialized (i.e. on boot cmdline). */
 +static int param_set_aaintbool(const char *val, const struct kernel_param *kp)
 +{
 +	struct kernel_param kp_local;
 +	bool value;
 +	int error;
 +
 +	if (apparmor_initialized)
 +		return -EPERM;
 +
 +	/* Create local copy, with arg pointing to bool type. */
 +	value = !!*((int *)kp->arg);
 +	memcpy(&kp_local, kp, sizeof(kp_local));
 +	kp_local.arg = &value;
 +
 +	error = param_set_bool(val, &kp_local);
 +	if (!error)
 +		*((int *)kp->arg) = *((bool *)kp_local.arg);
 +	return error;
 +}
 +
 +/*
 + * To avoid changing /sys/module/apparmor/parameters/enabled from Y/N to
 + * 1/0, this converts the "int that is actually bool" back to bool for
 + * display in the /sys filesystem, while keeping it "int" for the LSM
 + * infrastructure.
 + */
 +static int param_get_aaintbool(char *buffer, const struct kernel_param *kp)
 +{
 +	struct kernel_param kp_local;
 +	bool value;
 +
 +	/* Create local copy, with arg pointing to bool type. */
 +	value = !!*((int *)kp->arg);
 +	memcpy(&kp_local, kp, sizeof(kp_local));
 +	kp_local.arg = &value;
 +
 +	return param_get_bool(buffer, &kp_local);
 +}
 +
+ static int param_set_aacompressionlevel(const char *val,
+ 					const struct kernel_param *kp)
+ {
+ 	int error;
+ 
+ 	if (!apparmor_enabled)
+ 		return -EINVAL;
+ 	if (apparmor_initialized)
+ 		return -EPERM;
+ 
+ 	error = param_set_int(val, kp);
+ 
+ 	aa_g_rawdata_compression_level = clamp(aa_g_rawdata_compression_level,
+ 					       Z_NO_COMPRESSION,
+ 					       Z_BEST_COMPRESSION);
+ 	pr_info("AppArmor: policy rawdata compression level set to %u\n",
+ 		aa_g_rawdata_compression_level);
+ 
+ 	return error;
+ }
+ 
+ static int param_get_aacompressionlevel(char *buffer,
+ 					const struct kernel_param *kp)
+ {
+ 	if (!apparmor_enabled)
+ 		return -EINVAL;
+ 	if (apparmor_initialized && !policy_view_capable(NULL))
+ 		return -EPERM;
+ 	return param_get_int(buffer, kp);
+ }
+ 
  static int param_get_audit(char *buffer, const struct kernel_param *kp)
  {
  	if (!apparmor_enabled)

Attachment: pgpxgGbWCWB3j.pgp
Description: OpenPGP digital signature