Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security subsystem updates from James Morris:
 "Highlights:

  IMA:
   - provide ">" and "<" operators for fowner/uid/euid rules

  KEYS:
   - add a system blacklist keyring

   - add KEYCTL_RESTRICT_KEYRING, exposes keyring link restriction
     functionality to userland via keyctl()

  LSM:
   - harden LSM API with __ro_after_init

   - add prlmit security hook, implement for SELinux

   - revive security_task_alloc hook

  TPM:
   - implement contextual TPM command 'spaces'"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (98 commits)
  tpm: Fix reference count to main device
  tpm_tis: convert to using locality callbacks
  tpm: fix handling of the TPM 2.0 event logs
  tpm_crb: remove a cruft constant
  keys: select CONFIG_CRYPTO when selecting DH / KDF
  apparmor: Make path_max parameter readonly
  apparmor: fix parameters so that the permission test is bypassed at boot
  apparmor: fix invalid reference to index variable of iterator line 836
  apparmor: use SHASH_DESC_ON_STACK
  security/apparmor/lsm.c: set debug messages
  apparmor: fix boolreturn.cocci warnings
  Smack: Use GFP_KERNEL for smk_netlbl_mls().
  smack: fix double free in smack_parse_opts_str()
  KEYS: add SP800-56A KDF support for DH
  KEYS: Keyring asymmetric key restrict method with chaining
  KEYS: Restrict asymmetric key linkage using a specific keychain
  KEYS: Add a lookup_restriction function for the asymmetric key type
  KEYS: Add KEYCTL_RESTRICT_KEYRING
  KEYS: Consistent ordering for __key_link_begin and restrict check
  KEYS: Add an optional lookup_restriction hook to key_type
  ...

2 files changed, 17 insertions, 17 deletions

diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
index 7041a580019e..223f21ffa632 100644
--- a/security/tomoyo/file.c
+++ b/security/tomoyo/file.c
@@ -692,7 +692,7 @@ int tomoyo_path_number_perm(const u8 type, const struct path *path,
 {
         struct tomoyo_request_info r;
         struct tomoyo_obj_info obj = {
-                .path1 = *path,
+                .path1 = { .mnt = path->mnt, .dentry = path->dentry },
         };
         int error = -ENOMEM;
         struct tomoyo_path_info buf;
@@ -740,7 +740,7 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
         struct tomoyo_path_info buf;
         struct tomoyo_request_info r;
         struct tomoyo_obj_info obj = {
-                .path1 = *path,
+                .path1 = { .mnt = path->mnt, .dentry = path->dentry },
         };
         int idx;
 
@@ -786,7 +786,7 @@ int tomoyo_path_perm(const u8 operation, const struct path *path, const char *ta
 {
         struct tomoyo_request_info r;
         struct tomoyo_obj_info obj = {
-                .path1 = *path,
+                .path1 = { .mnt = path->mnt, .dentry = path->dentry },
         };
         int error;
         struct tomoyo_path_info buf;
@@ -843,7 +843,7 @@ int tomoyo_mkdev_perm(const u8 operation, const struct path *path,
 {
         struct tomoyo_request_info r;
         struct tomoyo_obj_info obj = {
-                .path1 = *path,
+                .path1 = { .mnt = path->mnt, .dentry = path->dentry },
         };
         int error = -ENOMEM;
         struct tomoyo_path_info buf;
@@ -890,8 +890,8 @@ int tomoyo_path2_perm(const u8 operation, const struct path *path1,
         struct tomoyo_path_info buf2;
         struct tomoyo_request_info r;
         struct tomoyo_obj_info obj = {
-                .path1 = *path1,
-                .path2 = *path2,
+                .path1 = { .mnt = path1->mnt, .dentry = path1->dentry },
+                .path2 = { .mnt = path2->mnt, .dentry = path2->dentry }
         };
         int idx;
 
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index edc52d620f29..130b4fa4f65f 100644
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
@@ -165,7 +165,7 @@ static int tomoyo_path_truncate(const struct path *path)
  */
 static int tomoyo_path_unlink(const struct path *parent, struct dentry *dentry)
 {
-        struct path path = { parent->mnt, dentry };
+        struct path path = { .mnt = parent->mnt, .dentry = dentry };
         return tomoyo_path_perm(TOMOYO_TYPE_UNLINK, &path, NULL);
 }
 
@@ -181,7 +181,7 @@ static int tomoyo_path_unlink(const struct path *parent, struct dentry *dentry)
 static int tomoyo_path_mkdir(const struct path *parent, struct dentry *dentry,
                              umode_t mode)
 {
-        struct path path = { parent->mnt, dentry };
+        struct path path = { .mnt = parent->mnt, .dentry = dentry };
         return tomoyo_path_number_perm(TOMOYO_TYPE_MKDIR, &path,
                                        mode & S_IALLUGO);
 }
@@ -196,7 +196,7 @@ static int tomoyo_path_mkdir(const struct path *parent, struct dentry *dentry,
  */
 static int tomoyo_path_rmdir(const struct path *parent, struct dentry *dentry)
 {
-        struct path path = { parent->mnt, dentry };
+        struct path path = { .mnt = parent->mnt, .dentry = dentry };
         return tomoyo_path_perm(TOMOYO_TYPE_RMDIR, &path, NULL);
 }
 
@@ -212,7 +212,7 @@ static int tomoyo_path_rmdir(const struct path *parent, struct dentry *dentry)
 static int tomoyo_path_symlink(const struct path *parent, struct dentry *dentry,
                                const char *old_name)
 {
-        struct path path = { parent->mnt, dentry };
+        struct path path = { .mnt = parent->mnt, .dentry = dentry };
         return tomoyo_path_perm(TOMOYO_TYPE_SYMLINK, &path, old_name);
 }
 
@@ -229,7 +229,7 @@ static int tomoyo_path_symlink(const struct path *parent, struct dentry *dentry,
 static int tomoyo_path_mknod(const struct path *parent, struct dentry *dentry,
                              umode_t mode, unsigned int dev)
 {
-        struct path path = { parent->mnt, dentry };
+        struct path path = { .mnt = parent->mnt, .dentry = dentry };
         int type = TOMOYO_TYPE_CREATE;
         const unsigned int perm = mode & S_IALLUGO;
 
@@ -268,8 +268,8 @@ static int tomoyo_path_mknod(const struct path *parent, struct dentry *dentry,
 static int tomoyo_path_link(struct dentry *old_dentry, const struct path *new_dir,
                             struct dentry *new_dentry)
 {
-        struct path path1 = { new_dir->mnt, old_dentry };
-        struct path path2 = { new_dir->mnt, new_dentry };
+        struct path path1 = { .mnt = new_dir->mnt, .dentry = old_dentry };
+        struct path path2 = { .mnt = new_dir->mnt, .dentry = new_dentry };
         return tomoyo_path2_perm(TOMOYO_TYPE_LINK, &path1, &path2);
 }
 
@@ -288,8 +288,8 @@ static int tomoyo_path_rename(const struct path *old_parent,
                               const struct path *new_parent,
                               struct dentry *new_dentry)
 {
-        struct path path1 = { old_parent->mnt, old_dentry };
-        struct path path2 = { new_parent->mnt, new_dentry };
+        struct path path1 = { .mnt = old_parent->mnt, .dentry = old_dentry };
+        struct path path2 = { .mnt = new_parent->mnt, .dentry = new_dentry };
         return tomoyo_path2_perm(TOMOYO_TYPE_RENAME, &path1, &path2);
 }
 
@@ -417,7 +417,7 @@ static int tomoyo_sb_mount(const char *dev_name, const struct path *path,
  */
 static int tomoyo_sb_umount(struct vfsmount *mnt, int flags)
 {
-        struct path path = { mnt, mnt->mnt_root };
+        struct path path = { .mnt = mnt, .dentry = mnt->mnt_root };
         return tomoyo_path_perm(TOMOYO_TYPE_UMOUNT, &path, NULL);
 }
 
@@ -496,7 +496,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
  * tomoyo_security_ops is a "struct security_operations" which is used for
  * registering TOMOYO.
  */
-static struct security_hook_list tomoyo_hooks[] = {
+static struct security_hook_list tomoyo_hooks[] __lsm_ro_after_init = {
         LSM_HOOK_INIT(cred_alloc_blank, tomoyo_cred_alloc_blank),
         LSM_HOOK_INIT(cred_prepare, tomoyo_cred_prepare),
         LSM_HOOK_INIT(cred_transfer, tomoyo_cred_transfer),