public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: John Johansen <john.johansen@canonical•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Kees Cook <keescook@chromium•org>,
	Chris Coulson <chris.coulson@canonical•com>
Subject: linux-next: manual merge of the apparmor tree with Linus' tree
Date: Thu, 11 Apr 2019 12:24:08 +1000	[thread overview]
Message-ID: <20190411122408.7b35cf74@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 3472 bytes --]

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

next             reply	other threads:[~2019-04-11  2:24 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-11  2:24 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-06-20  3:40 linux-next: manual merge of the apparmor tree with Linus' tree Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190411122408.7b35cf74@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=chris.coulson@canonical$(echo .)com \
    --cc=john.johansen@canonical$(echo .)com \
    --cc=keescook@chromium$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox