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

Pull security layer updates from James Morris:

 - a major update for AppArmor. From JJ:

     * several bug fixes and cleanups

     * the patch to add symlink support to securityfs that was floated
       on the list earlier and the apparmorfs changes that make use of
       securityfs symlinks

     * it introduces the domain labeling base code that Ubuntu has been
       carrying for several years, with several cleanups applied. And it
       converts the current mediation over to using the domain labeling
       base, which brings domain stacking support with it. This finally
       will bring the base upstream code in line with Ubuntu and provide
       a base to upstream the new feature work that Ubuntu carries.

     * This does _not_ contain any of the newer apparmor mediation
       features/controls (mount, signals, network, keys, ...) that
       Ubuntu is currently carrying, all of which will be RFC'd on top
       of this.

 - Notable also is the Infiniband work in SELinux, and the new file:map
   permission. From Paul:

      "While we're down to 21 patches for v4.13 (it was 31 for v4.12),
       the diffstat jumps up tremendously with over 2k of line changes.

       Almost all of these changes are the SELinux/IB work done by
       Daniel Jurgens; some other noteworthy changes include a NFS v4.2
       labeling fix, a new file:map permission, and reporting of policy
       capabilities on policy load"

   There's also now genfscon labeling support for tracefs, which was
   lost in v4.1 with the separation from debugfs.

 - Smack incorporates a safer socket check in file_receive, and adds a
   cap_capable call in privilege check.

 - TPM as usual has a bunch of fixes and enhancements.

 - Multiple calls to security_add_hooks() can now be made for the same
   LSM, to allow LSMs to have hook declarations across multiple files.

 - IMA now supports different "ima_appraise=" modes (eg. log, fix) from
   the boot command line.

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (126 commits)
  apparmor: put back designators in struct initialisers
  seccomp: Switch from atomic_t to recount_t
  seccomp: Adjust selftests to avoid double-join
  seccomp: Clean up core dump logic
  IMA: update IMA policy documentation to include pcr= option
  ima: Log the same audit cause whenever a file has no signature
  ima: Simplify policy_func_show.
  integrity: Small code improvements
  ima: fix get_binary_runtime_size()
  ima: use ima_parse_buf() to parse template data
  ima: use ima_parse_buf() to parse measurements headers
  ima: introduce ima_parse_buf()
  ima: Add cgroups2 to the defaults list
  ima: use memdup_user_nul
  ima: fix up #endif comments
  IMA: Correct Kconfig dependencies for hash selection
  ima: define is_ima_appraise_enabled()
  ima: define Kconfig IMA_APPRAISE_BOOTPARAM option
  ima: define a set of appraisal rules requiring file signatures
  ima: extend the "ima_policy" boot command line to support multiple policies
  ...

1 files changed, 34 insertions, 17 deletions

diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index 03f1fa495d74..00a928b833d0 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -1822,6 +1822,23 @@ struct tsync_sibling {
         struct __test_metadata *metadata;
 };
 
+/*
+ * To avoid joining joined threads (which is not allowed by Bionic),
+ * make sure we both successfully join and clear the tid to skip a
+ * later join attempt during fixture teardown. Any remaining threads
+ * will be directly killed during teardown.
+ */
+#define PTHREAD_JOIN(tid, status)                                       \
+        do {                                                            \
+                int _rc = pthread_join(tid, status);                    \
+                if (_rc) {                                              \
+                        TH_LOG("pthread_join of tid %u failed: %d\n",   \
+                                (unsigned int)tid, _rc);                \
+                } else {                                                \
+                        tid = 0;                                        \
+                }                                                       \
+        } while (0)
+
 FIXTURE_DATA(TSYNC) {
         struct sock_fprog root_prog, apply_prog;
         struct tsync_sibling sibling[TSYNC_SIBLINGS];
@@ -1890,14 +1907,14 @@ FIXTURE_TEARDOWN(TSYNC)
 
         for ( ; sib < self->sibling_count; ++sib) {
                 struct tsync_sibling *s = &self->sibling[sib];
-                void *status;
 
                 if (!s->tid)
                         continue;
-                if (pthread_kill(s->tid, 0)) {
-                        pthread_cancel(s->tid);
-                        pthread_join(s->tid, &status);
-                }
+                /*
+                 * If a thread is still running, it may be stuck, so hit
+                 * it over the head really hard.
+                 */
+                pthread_kill(s->tid, 9);
         }
         pthread_mutex_destroy(&self->mutex);
         pthread_cond_destroy(&self->cond);
@@ -1987,9 +2004,9 @@ TEST_F(TSYNC, siblings_fail_prctl)
         pthread_mutex_unlock(&self->mutex);
 
         /* Ensure diverging sibling failed to call prctl. */
-        pthread_join(self->sibling[0].tid, &status);
+        PTHREAD_JOIN(self->sibling[0].tid, &status);
         EXPECT_EQ(SIBLING_EXIT_FAILURE, (long)status);
-        pthread_join(self->sibling[1].tid, &status);
+        PTHREAD_JOIN(self->sibling[1].tid, &status);
         EXPECT_EQ(SIBLING_EXIT_UNKILLED, (long)status);
 }
 
@@ -2029,9 +2046,9 @@ TEST_F(TSYNC, two_siblings_with_ancestor)
         }
         pthread_mutex_unlock(&self->mutex);
         /* Ensure they are both killed and don't exit cleanly. */
-        pthread_join(self->sibling[0].tid, &status);
+        PTHREAD_JOIN(self->sibling[0].tid, &status);
         EXPECT_EQ(0x0, (long)status);
-        pthread_join(self->sibling[1].tid, &status);
+        PTHREAD_JOIN(self->sibling[1].tid, &status);
         EXPECT_EQ(0x0, (long)status);
 }
 
@@ -2055,9 +2072,9 @@ TEST_F(TSYNC, two_sibling_want_nnp)
         pthread_mutex_unlock(&self->mutex);
 
         /* Ensure they are both upset about lacking nnp. */
-        pthread_join(self->sibling[0].tid, &status);
+        PTHREAD_JOIN(self->sibling[0].tid, &status);
         EXPECT_EQ(SIBLING_EXIT_NEWPRIVS, (long)status);
-        pthread_join(self->sibling[1].tid, &status);
+        PTHREAD_JOIN(self->sibling[1].tid, &status);
         EXPECT_EQ(SIBLING_EXIT_NEWPRIVS, (long)status);
 }
 
@@ -2095,9 +2112,9 @@ TEST_F(TSYNC, two_siblings_with_no_filter)
         pthread_mutex_unlock(&self->mutex);
 
         /* Ensure they are both killed and don't exit cleanly. */
-        pthread_join(self->sibling[0].tid, &status);
+        PTHREAD_JOIN(self->sibling[0].tid, &status);
         EXPECT_EQ(0x0, (long)status);
-        pthread_join(self->sibling[1].tid, &status);
+        PTHREAD_JOIN(self->sibling[1].tid, &status);
         EXPECT_EQ(0x0, (long)status);
 }
 
@@ -2140,9 +2157,9 @@ TEST_F(TSYNC, two_siblings_with_one_divergence)
         pthread_mutex_unlock(&self->mutex);
 
         /* Ensure they are both unkilled. */
-        pthread_join(self->sibling[0].tid, &status);
+        PTHREAD_JOIN(self->sibling[0].tid, &status);
         EXPECT_EQ(SIBLING_EXIT_UNKILLED, (long)status);
-        pthread_join(self->sibling[1].tid, &status);
+        PTHREAD_JOIN(self->sibling[1].tid, &status);
         EXPECT_EQ(SIBLING_EXIT_UNKILLED, (long)status);
 }
 
@@ -2199,7 +2216,7 @@ TEST_F(TSYNC, two_siblings_not_under_filter)
                 TH_LOG("cond broadcast non-zero");
         }
         pthread_mutex_unlock(&self->mutex);
-        pthread_join(self->sibling[sib].tid, &status);
+        PTHREAD_JOIN(self->sibling[sib].tid, &status);
         EXPECT_EQ(SIBLING_EXIT_UNKILLED, (long)status);
         /* Poll for actual task death. pthread_join doesn't guarantee it. */
         while (!kill(self->sibling[sib].system_tid, 0))
@@ -2224,7 +2241,7 @@ TEST_F(TSYNC, two_siblings_not_under_filter)
                 TH_LOG("cond broadcast non-zero");
         }
         pthread_mutex_unlock(&self->mutex);
-        pthread_join(self->sibling[sib].tid, &status);
+        PTHREAD_JOIN(self->sibling[sib].tid, &status);
         EXPECT_EQ(0, (long)status);
         /* Poll for actual task death. pthread_join doesn't guarantee it. */
         while (!kill(self->sibling[sib].system_tid, 0))