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

Pull security subsystem updates for 3.4 from James Morris:
 "The main addition here is the new Yama security module from Kees Cook,
  which was discussed at the Linux Security Summit last year.  Its
  purpose is to collect miscellaneous DAC security enhancements in one
  place.  This also marks a departure in policy for LSM modules, which
  were previously limited to being standalone access control systems.
  Chromium OS is using Yama, and I believe there are plans for Ubuntu,
  at least.

  This patchset also includes maintenance updates for AppArmor, TOMOYO
  and others."

Fix trivial conflict in <net/sock.h> due to the jumo_label->static_key
rename.

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits)
  AppArmor: Fix location of const qualifier on generated string tables
  TOMOYO: Return error if fails to delete a domain
  AppArmor: add const qualifiers to string arrays
  AppArmor: Add ability to load extended policy
  TOMOYO: Return appropriate value to poll().
  AppArmor: Move path failure information into aa_get_name and rename
  AppArmor: Update dfa matching routines.
  AppArmor: Minor cleanup of d_namespace_path to consolidate error handling
  AppArmor: Retrieve the dentry_path for error reporting when path lookup fails
  AppArmor: Add const qualifiers to generated string tables
  AppArmor: Fix oops in policy unpack auditing
  AppArmor: Fix error returned when a path lookup is disconnected
  KEYS: testing wrong bit for KEY_FLAG_REVOKED
  TOMOYO: Fix mount flags checking order.
  security: fix ima kconfig warning
  AppArmor: Fix the error case for chroot relative path name lookup
  AppArmor: fix mapping of META_READ to audit and quiet flags
  AppArmor: Fix underflow in xindex calculation
  AppArmor: Fix dropping of allowed operations that are force audited
  AppArmor: Add mising end of structure test to caps unpacking
  ...

5 files changed, 51 insertions, 65 deletions

diff --git a/security/tomoyo/audit.c b/security/tomoyo/audit.c
index 5ca47ea3049f..7ef9fa3e37e0 100644
--- a/security/tomoyo/audit.c
+++ b/security/tomoyo/audit.c
@@ -446,11 +446,11 @@ void tomoyo_read_log(struct tomoyo_io_buffer *head)
  * tomoyo_poll_log - Wait for an audit log.
  *
  * @file: Pointer to "struct file".
- * @wait: Pointer to "poll_table".
+ * @wait: Pointer to "poll_table". Maybe NULL.
  *
  * Returns POLLIN | POLLRDNORM when ready to read an audit log.
  */
-int tomoyo_poll_log(struct file *file, poll_table *wait)
+unsigned int tomoyo_poll_log(struct file *file, poll_table *wait)
 {
         if (tomoyo_log_count)
                 return POLLIN | POLLRDNORM;
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index c47d3ce6c733..8656b16eef7b 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -1069,7 +1069,7 @@ static int tomoyo_write_task(struct tomoyo_acl_param *param)
  *
  * @domainname: The name of domain.
  *
- * Returns 0.
+ * Returns 0 on success, negative value otherwise.
  *
  * Caller holds tomoyo_read_lock().
  */
@@ -1081,7 +1081,7 @@ static int tomoyo_delete_domain(char *domainname)
         name.name = domainname;
         tomoyo_fill_path_info(&name);
         if (mutex_lock_interruptible(&tomoyo_policy_lock))
-                return 0;
+                return -EINTR;
         /* Is there an active domain? */
         list_for_each_entry_rcu(domain, &tomoyo_domain_list, list) {
                 /* Never delete tomoyo_kernel_domain */
@@ -1164,15 +1164,16 @@ static int tomoyo_write_domain(struct tomoyo_io_buffer *head)
         bool is_select = !is_delete && tomoyo_str_starts(&data, "select ");
         unsigned int profile;
         if (*data == '<') {
+                int ret = 0;
                 domain = NULL;
                 if (is_delete)
-                        tomoyo_delete_domain(data);
+                        ret = tomoyo_delete_domain(data);
                 else if (is_select)
                         domain = tomoyo_find_domain(data);
                 else
                         domain = tomoyo_assign_domain(data, false);
                 head->w.domain = domain;
-                return 0;
+                return ret;
         }
         if (!domain)
                 return -EINVAL;
@@ -2111,7 +2112,7 @@ static struct tomoyo_domain_info *tomoyo_find_domain_by_qid
         struct tomoyo_domain_info *domain = NULL;
         spin_lock(&tomoyo_query_list_lock);
         list_for_each_entry(ptr, &tomoyo_query_list, list) {
-                if (ptr->serial != serial || ptr->answer)
+                if (ptr->serial != serial)
                         continue;
                 domain = ptr->domain;
                 break;
@@ -2130,28 +2131,13 @@ static struct tomoyo_domain_info *tomoyo_find_domain_by_qid
  *
  * Waits for access requests which violated policy in enforcing mode.
  */
-static int tomoyo_poll_query(struct file *file, poll_table *wait)
+static unsigned int tomoyo_poll_query(struct file *file, poll_table *wait)
 {
-        struct list_head *tmp;
-        bool found = false;
-        u8 i;
-        for (i = 0; i < 2; i++) {
-                spin_lock(&tomoyo_query_list_lock);
-                list_for_each(tmp, &tomoyo_query_list) {
-                        struct tomoyo_query *ptr =
-                                list_entry(tmp, typeof(*ptr), list);
-                        if (ptr->answer)
-                                continue;
-                        found = true;
-                        break;
-                }
-                spin_unlock(&tomoyo_query_list_lock);
-                if (found)
-                        return POLLIN | POLLRDNORM;
-                if (i)
-                        break;
-                poll_wait(file, &tomoyo_query_wait, wait);
-        }
+        if (!list_empty(&tomoyo_query_list))
+                return POLLIN | POLLRDNORM;
+        poll_wait(file, &tomoyo_query_wait, wait);
+        if (!list_empty(&tomoyo_query_list))
+                return POLLIN | POLLRDNORM;
         return 0;
 }
 
@@ -2175,8 +2161,6 @@ static void tomoyo_read_query(struct tomoyo_io_buffer *head)
         spin_lock(&tomoyo_query_list_lock);
         list_for_each(tmp, &tomoyo_query_list) {
                 struct tomoyo_query *ptr = list_entry(tmp, typeof(*ptr), list);
-                if (ptr->answer)
-                        continue;
                 if (pos++ != head->r.query_index)
                         continue;
                 len = ptr->query_len;
@@ -2194,8 +2178,6 @@ static void tomoyo_read_query(struct tomoyo_io_buffer *head)
         spin_lock(&tomoyo_query_list_lock);
         list_for_each(tmp, &tomoyo_query_list) {
                 struct tomoyo_query *ptr = list_entry(tmp, typeof(*ptr), list);
-                if (ptr->answer)
-                        continue;
                 if (pos++ != head->r.query_index)
                         continue;
                 /*
@@ -2243,8 +2225,10 @@ static int tomoyo_write_answer(struct tomoyo_io_buffer *head)
                 struct tomoyo_query *ptr = list_entry(tmp, typeof(*ptr), list);
                 if (ptr->serial != serial)
                         continue;
-                if (!ptr->answer)
-                        ptr->answer = answer;
+                ptr->answer = answer;
+                /* Remove from tomoyo_query_list. */
+                if (ptr->answer)
+                        list_del_init(&ptr->list);
                 break;
         }
         spin_unlock(&tomoyo_query_list_lock);
@@ -2477,18 +2461,17 @@ int tomoyo_open_control(const u8 type, struct file *file)
  * tomoyo_poll_control - poll() for /sys/kernel/security/tomoyo/ interface.
  *
  * @file: Pointer to "struct file".
- * @wait: Pointer to "poll_table".
+ * @wait: Pointer to "poll_table". Maybe NULL.
  *
- * Waits for read readiness.
- * /sys/kernel/security/tomoyo/query is handled by /usr/sbin/tomoyo-queryd and
- * /sys/kernel/security/tomoyo/audit is handled by /usr/sbin/tomoyo-auditd.
+ * Returns POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM if ready to read/write,
+ * POLLOUT | POLLWRNORM otherwise.
  */
-int tomoyo_poll_control(struct file *file, poll_table *wait)
+unsigned int tomoyo_poll_control(struct file *file, poll_table *wait)
 {
         struct tomoyo_io_buffer *head = file->private_data;
-        if (!head->poll)
-                return -ENOSYS;
-        return head->poll(file, wait);
+        if (head->poll)
+                return head->poll(file, wait) | POLLOUT | POLLWRNORM;
+        return POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM;
 }
 
 /**
diff --git a/security/tomoyo/common.h b/security/tomoyo/common.h
index 9512222d5581..30fd98369700 100644
--- a/security/tomoyo/common.h
+++ b/security/tomoyo/common.h
@@ -788,7 +788,7 @@ struct tomoyo_acl_param {
 struct tomoyo_io_buffer {
         void (*read) (struct tomoyo_io_buffer *);
         int (*write) (struct tomoyo_io_buffer *);
-        int (*poll) (struct file *file, poll_table *wait);
+        unsigned int (*poll) (struct file *file, poll_table *wait);
         /* Exclusive lock for this structure.   */
         struct mutex io_sem;
         char __user *read_user_buf;
@@ -981,8 +981,8 @@ int tomoyo_path_number_perm(const u8 operation, struct path *path,
                             unsigned long number);
 int tomoyo_path_perm(const u8 operation, struct path *path,
                      const char *target);
-int tomoyo_poll_control(struct file *file, poll_table *wait);
-int tomoyo_poll_log(struct file *file, poll_table *wait);
+unsigned int tomoyo_poll_control(struct file *file, poll_table *wait);
+unsigned int tomoyo_poll_log(struct file *file, poll_table *wait);
 int tomoyo_socket_bind_permission(struct socket *sock, struct sockaddr *addr,
                                   int addr_len);
 int tomoyo_socket_connect_permission(struct socket *sock,
diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
index bee09d062057..fe00cdfd0267 100644
--- a/security/tomoyo/mount.c
+++ b/security/tomoyo/mount.c
@@ -199,30 +199,32 @@ int tomoyo_mount_permission(char *dev_name, struct path *path,
         if (flags & MS_REMOUNT) {
                 type = tomoyo_mounts[TOMOYO_MOUNT_REMOUNT];
                 flags &= ~MS_REMOUNT;
-        }
-        if (flags & MS_MOVE) {
-                type = tomoyo_mounts[TOMOYO_MOUNT_MOVE];
-                flags &= ~MS_MOVE;
-        }
-        if (flags & MS_BIND) {
+        } else if (flags & MS_BIND) {
                 type = tomoyo_mounts[TOMOYO_MOUNT_BIND];
                 flags &= ~MS_BIND;
-        }
-        if (flags & MS_UNBINDABLE) {
-                type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_UNBINDABLE];
-                flags &= ~MS_UNBINDABLE;
-        }
-        if (flags & MS_PRIVATE) {
+        } else if (flags & MS_SHARED) {
+                if (flags & (MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
+                        return -EINVAL;
+                type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_SHARED];
+                flags &= ~MS_SHARED;
+        } else if (flags & MS_PRIVATE) {
+                if (flags & (MS_SHARED | MS_SLAVE | MS_UNBINDABLE))
+                        return -EINVAL;
                 type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_PRIVATE];
                 flags &= ~MS_PRIVATE;
-        }
-        if (flags & MS_SLAVE) {
+        } else if (flags & MS_SLAVE) {
+                if (flags & (MS_SHARED | MS_PRIVATE | MS_UNBINDABLE))
+                        return -EINVAL;
                 type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_SLAVE];
                 flags &= ~MS_SLAVE;
-        }
-        if (flags & MS_SHARED) {
-                type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_SHARED];
-                flags &= ~MS_SHARED;
+        } else if (flags & MS_UNBINDABLE) {
+                if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE))
+                        return -EINVAL;
+                type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_UNBINDABLE];
+                flags &= ~MS_UNBINDABLE;
+        } else if (flags & MS_MOVE) {
+                type = tomoyo_mounts[TOMOYO_MOUNT_MOVE];
+                flags &= ~MS_MOVE;
         }
         if (!type)
                 type = "<NULL>";
diff --git a/security/tomoyo/securityfs_if.c b/security/tomoyo/securityfs_if.c
index 482b2a5f48f0..8592f2fc6ebb 100644
--- a/security/tomoyo/securityfs_if.c
+++ b/security/tomoyo/securityfs_if.c
@@ -157,9 +157,10 @@ static int tomoyo_release(struct inode *inode, struct file *file)
  * tomoyo_poll - poll() for /sys/kernel/security/tomoyo/ interface.
  *
  * @file: Pointer to "struct file".
- * @wait: Pointer to "poll_table".
+ * @wait: Pointer to "poll_table". Maybe NULL.
  *
- * Returns 0 on success, negative value otherwise.
+ * Returns POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM if ready to read/write,
+ * POLLOUT | POLLWRNORM otherwise.
  */
 static unsigned int tomoyo_poll(struct file *file, poll_table *wait)
 {