xlat: add PR_SPEC_INDIRECT_BRANCH to pr_spec_cmds

* xlat/pr_spec_cmds.in (PR_SPEC_INDIRECT_BRANCH): New constant,
introduced by Linux commit v4.20-rc5~4^2~3.
* prctl.c (SYS_FUNC(prctl)) <case PR_GET_SPECULATION_CTRL, case
PR_SET_SPECULATION_CTRL>: Add PR_SPEC_INDIRECT_BRANCH handling.
* tests/prctl-spec-inject.c (main): Add PR_SPEC_INDIRECT_BRANCH decoding
checks, update expected output.
* NEWS: Mention this.

Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>

diff --git a/NEWS b/NEWS
index 48ca3cecb9a242fe6fc8e072a95e540ddd700ae4..e5b78b9ea40d3d7af038425e0ae8160dd04d3d71 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,7 +24,7 @@ Noteworthy changes in release ?.?? (????-??-??)
   * Enhanced error diagnostics when the first exec fails.
   * Added %net as a short form of %network in syscall specifications.
   * Updated lists of ABS_*, BPF_*, FAN_*, IFA_*, IFLA_*, KVM_CAP_*, NETLINK_*,
-    NTF_*, REL_*, SOL_*, TCA_*, and V4L2_* constants.
+    NTF_*, PR_SPEC_*, REL_*, SOL_*, TCA_*, and V4L2_* constants.
   * Enhanced manual page.
 
 * Bug fixes

diff --git a/prctl.c b/prctl.c
index 669f2632a3056b6938535d364274fba2dcb24457..75165103fa2664daf95dfd7d751ff2ce6afc3b9a 100644 (file)
--- a/prctl.c
+++ b/prctl.c
@@ -221,6 +221,7 @@ SYS_FUNC(prctl)
 
                switch (arg2) {
                case PR_SPEC_STORE_BYPASS:
+               case PR_SPEC_INDIRECT_BRANCH:
                        tcp->auxstr = sprintflags("",
                                                  pr_spec_get_store_bypass_flags,
                                                  (kernel_ulong_t) tcp->u_rval);
@@ -393,6 +394,7 @@ SYS_FUNC(prctl)
 
                switch (arg2) {
                case PR_SPEC_STORE_BYPASS:
+               case PR_SPEC_INDIRECT_BRANCH:
                        printxval64(pr_spec_set_store_bypass_flags, arg3,
                                    "PR_SPEC_???");
                        break;

diff --git a/tests/prctl-spec-inject.c b/tests/prctl-spec-inject.c
index 1247c3cfca6feeab8ffacdaebcfb27faa9224cdf..04403b432f5fac023e93ed06c1579facf051f74c 100644 (file)
--- a/tests/prctl-spec-inject.c
+++ b/tests/prctl-spec-inject.c
@@ -40,6 +40,15 @@ main(int argc, char **argv)
                (kernel_ulong_t) 0xdeadfacebadc0dedULL;
        static const kernel_ulong_t bogus_arg3 =
                (kernel_ulong_t) 0xdecafeedbeefda7eULL;
+
+       static const struct {
+               long arg;
+               const char *str;
+       } spec_strs[] = {
+               { 0, "PR_SPEC_STORE_BYPASS" },
+               { 1, "PR_SPEC_INDIRECT_BRANCH" },
+       };
+
        static const struct {
                long arg;
                const char *str;
@@ -78,8 +87,8 @@ main(int argc, char **argv)
        injected_val = strtol(argv[1], NULL, 0);
 
        /* PR_GET_SPECULATION_CTRL */
-       rc = do_prctl(52, 1, bogus_arg3);
-       printf("prctl(PR_GET_SPECULATION_CTRL, 0x1 /* PR_SPEC_??? */) "
+       rc = do_prctl(52, 2, bogus_arg3);
+       printf("prctl(PR_GET_SPECULATION_CTRL, 0x2 /* PR_SPEC_??? */) "
               "= %s (INJECTED)\n", sprintrc(rc));
 
        rc = do_prctl(52, bogus_arg2, bogus_arg3);
@@ -87,24 +96,26 @@ main(int argc, char **argv)
               "= %s (INJECTED)\n",
               (unsigned long long) bogus_arg2, sprintrc(rc));
 
-       rc = do_prctl(52, 0, bogus_arg3);
+       for (unsigned c = 0; c < ARRAY_SIZE(spec_strs); c++) {
+               rc = do_prctl(52, spec_strs[c].arg, bogus_arg3);
 
-       for (unsigned i = 0; i < ARRAY_SIZE(get_strs); i++) {
-               if (get_strs[i].arg == rc) {
-                       str = get_strs[i].str;
-                       break;
+               for (unsigned i = 0; i < ARRAY_SIZE(get_strs); i++) {
+                       if (get_strs[i].arg == rc) {
+                               str = get_strs[i].str;
+                               break;
+                       }
                }
-       }
-       if (!str)
-               error_msg_and_fail("Unknown return value: %ld", rc);
+               if (!str)
+                       error_msg_and_fail("Unknown return value: %ld", rc);
 
-       printf("prctl(PR_GET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS) "
-              "= %s%s (INJECTED)\n", sprintrc(rc), str);
+               printf("prctl(PR_GET_SPECULATION_CTRL, %s) = %s%s (INJECTED)\n",
+                      spec_strs[c].str, sprintrc(rc), str);
+       }
 
 
        /* PR_SET_SPECULATION_CTRL*/
-       rc = do_prctl(53, 1, bogus_arg3);
-       printf("prctl(PR_SET_SPECULATION_CTRL, 0x1 /* PR_SPEC_??? */, %#llx) "
+       rc = do_prctl(53, 2, bogus_arg3);
+       printf("prctl(PR_SET_SPECULATION_CTRL, 0x2 /* PR_SPEC_??? */, %#llx) "
               "= %s (INJECTED)\n",
               (unsigned long long) bogus_arg3, sprintrc(rc));
 
@@ -115,11 +126,13 @@ main(int argc, char **argv)
               (unsigned long long) bogus_arg3,
               sprintrc(rc));
 
-       for (unsigned i = 0; i < ARRAY_SIZE(set_strs); i++) {
-               rc = do_prctl(53, 0, set_strs[i].arg);
-               printf("prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS"
-                      ", %s) = %s (INJECTED)\n",
-                      set_strs[i].str, sprintrc(rc));
+       for (unsigned c = 0; c < ARRAY_SIZE(spec_strs); c++) {
+               for (unsigned i = 0; i < ARRAY_SIZE(set_strs); i++) {
+                       rc = do_prctl(53, spec_strs[c].arg, set_strs[i].arg);
+                       printf("prctl(PR_SET_SPECULATION_CTRL, %s"
+                              ", %s) = %s (INJECTED)\n",
+                              spec_strs[c].str, set_strs[i].str, sprintrc(rc));
+               }
        }
 
        puts("+++ exited with 0 +++");

diff --git a/xlat/pr_spec_cmds.in b/xlat/pr_spec_cmds.in
index e006923db0fa93bd67280042d8f64b4548c49c20..8e5ded0b39b5fde5e17135c07b5ab33b4cb88c79 100644 (file)
--- a/xlat/pr_spec_cmds.in
+++ b/xlat/pr_spec_cmds.in
@@ -1 +1,3 @@
+#value_indexed
 PR_SPEC_STORE_BYPASS   0
+PR_SPEC_INDIRECT_BRANCH        1