]> granicus.if.org Git - strace/blobdiff - prctl.c
Remove HAVE_STRUCT_TCB_EXT_ARG, ext_arg, and u_lrval
[strace] / prctl.c
diff --git a/prctl.c b/prctl.c
index 29e00b097bd69f77285bc581fed0c74be545ade5..dede4c9dc32f5ef2b984dda5273b9adb19f85b14 100644 (file)
--- a/prctl.c
+++ b/prctl.c
 
 #include "defs.h"
 
-#include <sys/prctl.h>
+#include <linux/prctl.h>
 
 #include "xlat/prctl_options.h"
 #include "xlat/pr_cap_ambient.h"
+#include "xlat/pr_dumpable.h"
+#include "xlat/pr_fp_mode.h"
 #include "xlat/pr_mce_kill.h"
 #include "xlat/pr_mce_kill_policy.h"
 #include "xlat/pr_set_mm.h"
@@ -68,19 +70,28 @@ print_prctl_args(struct tcb *tcp, const unsigned int first)
        unsigned int i;
 
        for (i = first; i < tcp->s_ent->nargs; ++i)
-               tprintf(", %#lx", tcp->u_arg[i]);
+               tprintf(", %#" PRI_klx, tcp->u_arg[i]);
 }
 
 SYS_FUNC(prctl)
 {
        const unsigned int option = tcp->u_arg[0];
+       const kernel_ulong_t arg2 = tcp->u_arg[1];
+       const kernel_ulong_t arg3 = tcp->u_arg[2];
+       /*
+        * PR_SET_VMA is the only command which actually uses these arguments
+        * currently, and it is available only on Android for now.
+        */
+#ifdef __ANDROID__
+       const kernel_ulong_t arg4 = tcp->u_arg[3];
+       const kernel_ulong_t arg5 = tcp->u_arg[4];
+#endif
        unsigned int i;
 
        if (entering(tcp))
                printxval(prctl_options, option, "PR_???");
 
        switch (option) {
-       case PR_GET_DUMPABLE:
        case PR_GET_KEEPCAPS:
        case PR_GET_SECCOMP:
        case PR_GET_TIMERSLACK:
@@ -94,24 +105,33 @@ SYS_FUNC(prctl)
                if (entering(tcp))
                        tprints(", ");
                else
-                       printnum_int(tcp, tcp->u_arg[1], "%u");
+                       printnum_int(tcp, arg2, "%u");
                break;
 
-       case PR_GET_NAME:
+       case PR_GET_DUMPABLE:
                if (entering(tcp))
+                       break;
+               if (syserror(tcp))
+                       return 0;
+               tcp->auxstr = xlookup(pr_dumpable, (kernel_ulong_t) tcp->u_rval);
+               return RVAL_STR;
+
+       case PR_GET_NAME:
+               if (entering(tcp)) {
                        tprints(", ");
-               else {
+               else {
                        if (syserror(tcp))
-                               printaddr(tcp->u_arg[1]);
+                               printaddr(arg2);
                        else
-                               printstr(tcp, tcp->u_arg[1], -1);
+                               printstr_ex(tcp, arg2, TASK_COMM_LEN,
+                                           QUOTE_0_TERMINATED);
                }
                break;
 
        case PR_GET_PDEATHSIG:
-               if (entering(tcp))
+               if (entering(tcp)) {
                        tprints(", ");
-               else if (!umove_or_printaddr(tcp, tcp->u_arg[1], &i)) {
+               } else if (!umove_or_printaddr(tcp, arg2, &i)) {
                        tprints("[");
                        tprints(signame(i));
                        tprints("]");
@@ -124,20 +144,20 @@ SYS_FUNC(prctl)
                if (syserror(tcp) || tcp->u_rval == 0)
                        return 0;
                tcp->auxstr = sprintflags("", secbits,
-                                         (unsigned long) tcp->u_rval);
+                                         (kernel_ulong_t) tcp->u_rval);
                return RVAL_STR;
 
        case PR_GET_TID_ADDRESS:
                if (entering(tcp))
                        tprints(", ");
                else
-                       printnum_ptr(tcp, tcp->u_arg[1]);
+                       printnum_ptr(tcp, arg2);
                break;
 
        case PR_GET_TSC:
-               if (entering(tcp))
+               if (entering(tcp)) {
                        tprints(", ");
-               else if (!umove_or_printaddr(tcp, tcp->u_arg[1], &i)) {
+               } else if (!umove_or_printaddr(tcp, arg2, &i)) {
                        tprints("[");
                        printxval(pr_tsc, i, "PR_TSC_???");
                        tprints("]");
@@ -145,45 +165,59 @@ SYS_FUNC(prctl)
                break;
 
        case PR_GET_UNALIGN:
-               if (entering(tcp))
+               if (entering(tcp)) {
                        tprints(", ");
-               else if (!umove_or_printaddr(tcp, tcp->u_arg[1], &i)) {
+               } else if (!umove_or_printaddr(tcp, arg2, &i)) {
                        tprints("[");
                        printflags(pr_unalign_flags, i, "PR_UNALIGN_???");
                        tprints("]");
                }
                break;
 
+       case PR_GET_FP_MODE:
+               if (entering(tcp))
+                       break;
+               if (syserror(tcp) || tcp->u_rval == 0)
+                       return 0;
+               tcp->auxstr = sprintflags("", pr_fp_mode,
+                                         (kernel_ulong_t) tcp->u_rval);
+               return RVAL_STR;
+
        /* PR_TASK_PERF_EVENTS_* take no arguments. */
        case PR_TASK_PERF_EVENTS_DISABLE:
        case PR_TASK_PERF_EVENTS_ENABLE:
                return RVAL_DECODED;
 
        case PR_SET_CHILD_SUBREAPER:
-       case PR_SET_DUMPABLE:
        case PR_SET_ENDIAN:
        case PR_SET_FPEMU:
        case PR_SET_FPEXC:
        case PR_SET_KEEPCAPS:
        case PR_SET_TIMING:
-               tprintf(", %lu", tcp->u_arg[1]);
+               tprintf(", %" PRI_klu, arg2);
+               return RVAL_DECODED;
+
+       case PR_SET_DUMPABLE:
+               tprints(", ");
+               printxval64(pr_dumpable, arg2, "SUID_DUMP_???");
                return RVAL_DECODED;
 
        case PR_CAPBSET_DROP:
        case PR_CAPBSET_READ:
                tprints(", ");
-               printxval(cap, tcp->u_arg[1], "CAP_???");
+               printxval64(cap, arg2, "CAP_???");
                return RVAL_DECODED;
 
        case PR_CAP_AMBIENT:
                tprints(", ");
-               printxval(pr_cap_ambient, tcp->u_arg[1], "PR_CAP_AMBIENT_???");
-               switch (tcp->u_arg[1]) {
+               printxval64(pr_cap_ambient, arg2,
+                              "PR_CAP_AMBIENT_???");
+               switch (arg2) {
                case PR_CAP_AMBIENT_RAISE:
                case PR_CAP_AMBIENT_LOWER:
                case PR_CAP_AMBIENT_IS_SET:
                        tprints(", ");
-                       printxval(cap, tcp->u_arg[2], "CAP_???");
+                       printxval64(cap, arg3, "CAP_???");
                        print_prctl_args(tcp, 3);
                        break;
                default:
@@ -194,19 +228,20 @@ SYS_FUNC(prctl)
 
        case PR_MCE_KILL:
                tprints(", ");
-               printxval(pr_mce_kill, tcp->u_arg[1], "PR_MCE_KILL_???");
+               printxval64(pr_mce_kill, arg2, "PR_MCE_KILL_???");
                tprints(", ");
-               if (PR_MCE_KILL_SET == tcp->u_arg[1])
-                       printxval(pr_mce_kill_policy, tcp->u_arg[2],
-                                  "PR_MCE_KILL_???");
+               if (PR_MCE_KILL_SET == arg2)
+                       printxval64(pr_mce_kill_policy, arg3,
+                                   "PR_MCE_KILL_???");
                else
-                       tprintf("%#lx", tcp->u_arg[2]);
+                       tprintf("%#" PRI_klx, arg3);
                print_prctl_args(tcp, 3);
                return RVAL_DECODED;
 
        case PR_SET_NAME:
                tprints(", ");
-               printstr(tcp, tcp->u_arg[1], TASK_COMM_LEN);
+               printstr_ex(tcp, arg2, TASK_COMM_LEN - 1,
+                           QUOTE_0_TERMINATED);
                return RVAL_DECODED;
 
 #ifdef __ANDROID__
@@ -214,10 +249,10 @@ SYS_FUNC(prctl)
 #  define PR_SET_VMA_ANON_NAME    0
 # endif
        case PR_SET_VMA:
-               if (tcp->u_arg[1] == PR_SET_VMA_ANON_NAME) {
-                       tprintf(", PR_SET_VMA_ANON_NAME, %#lx", tcp->u_arg[2]);
-                       tprintf(", %lu, ", tcp->u_arg[3]);
-                       printstr(tcp, tcp->u_arg[4], -1);
+               if (arg2 == PR_SET_VMA_ANON_NAME) {
+                       tprintf(", PR_SET_VMA_ANON_NAME, %#" PRI_klx, arg3);
+                       tprintf(", %" PRI_klu ", ", arg4);
+                       printstr(tcp, arg5);
                } else {
                        /* There are no other sub-options now, but there
                         * might be in future... */
@@ -228,35 +263,35 @@ SYS_FUNC(prctl)
 
        case PR_SET_MM:
                tprints(", ");
-               printxval(pr_set_mm, tcp->u_arg[1], "PR_SET_MM_???");
+               printxval(pr_set_mm, arg2, "PR_SET_MM_???");
                print_prctl_args(tcp, 2);
                return RVAL_DECODED;
 
        case PR_SET_PDEATHSIG:
                tprints(", ");
-               if ((unsigned long) tcp->u_arg[1] > 128)
-                       tprintf("%lu", tcp->u_arg[1]);
+               if (arg2 > 128)
+                       tprintf("%" PRI_klu, arg2);
                else
-                       tprints(signame(tcp->u_arg[1]));
+                       tprints(signame(arg2));
                return RVAL_DECODED;
 
        case PR_SET_PTRACER:
                tprints(", ");
-               if (tcp->u_arg[1] == -1)
+               if ((int) arg2 == -1)
                        tprints("PR_SET_PTRACER_ANY");
                else
-                       tprintf("%lu", tcp->u_arg[1]);
+                       tprintf("%" PRI_klu, arg2);
                return RVAL_DECODED;
 
        case PR_SET_SECCOMP:
                tprints(", ");
-               printxval(seccomp_mode, tcp->u_arg[1],
-                         "SECCOMP_MODE_???");
-               if (SECCOMP_MODE_STRICT == tcp->u_arg[1])
+               printxval64(seccomp_mode, arg2,
+                           "SECCOMP_MODE_???");
+               if (SECCOMP_MODE_STRICT == arg2)
                        return RVAL_DECODED;
-               if (SECCOMP_MODE_FILTER == tcp->u_arg[1]) {
+               if (SECCOMP_MODE_FILTER == arg2) {
                        tprints(", ");
-                       print_seccomp_filter(tcp, tcp->u_arg[2]);
+                       print_seccomp_filter(tcp, arg3);
                        return RVAL_DECODED;
                }
                print_prctl_args(tcp, 2);
@@ -264,26 +299,26 @@ SYS_FUNC(prctl)
 
        case PR_SET_SECUREBITS:
                tprints(", ");
-               printflags(secbits, tcp->u_arg[1], "SECBIT_???");
+               printflags64(secbits, arg2, "SECBIT_???");
                return RVAL_DECODED;
 
        case PR_SET_TIMERSLACK:
-               tprintf(", %ld", tcp->u_arg[1]);
+               tprintf(", %" PRI_kld, arg2);
                return RVAL_DECODED;
 
        case PR_SET_TSC:
                tprints(", ");
-               printxval(pr_tsc, tcp->u_arg[1], "PR_TSC_???");
+               printxval(pr_tsc, arg2, "PR_TSC_???");
                return RVAL_DECODED;
 
        case PR_SET_UNALIGN:
                tprints(", ");
-               printflags(pr_unalign_flags, tcp->u_arg[1], "PR_UNALIGN_???");
+               printflags(pr_unalign_flags, arg2, "PR_UNALIGN_???");
                return RVAL_DECODED;
 
        case PR_SET_NO_NEW_PRIVS:
        case PR_SET_THP_DISABLE:
-               tprintf(", %lu", tcp->u_arg[1]);
+               tprintf(", %" PRI_klu, arg2);
                print_prctl_args(tcp, 2);
                return RVAL_DECODED;
 
@@ -295,9 +330,14 @@ SYS_FUNC(prctl)
                if (syserror(tcp))
                        return 0;
                tcp->auxstr = xlookup(pr_mce_kill_policy,
-                                     (unsigned long) tcp->u_rval);
+                                     (kernel_ulong_t) tcp->u_rval);
                return tcp->auxstr ? RVAL_STR : RVAL_UDECIMAL;
 
+       case PR_SET_FP_MODE:
+               tprints(", ");
+               printflags(pr_fp_mode, arg2, "PR_FP_MODE_???");
+               return RVAL_DECODED;
+
        case PR_GET_NO_NEW_PRIVS:
        case PR_GET_THP_DISABLE:
        case PR_MPX_DISABLE_MANAGEMENT:
@@ -316,6 +356,7 @@ SYS_FUNC(prctl)
 SYS_FUNC(arch_prctl)
 {
        const unsigned int option = tcp->u_arg[0];
+       const kernel_ulong_t addr = tcp->u_arg[1];
 
        if (entering(tcp))
                printxval(archvals, option, "ARCH_???");
@@ -326,11 +367,11 @@ SYS_FUNC(arch_prctl)
                if (entering(tcp))
                        tprints(", ");
                else
-                       printnum_ptr(tcp, tcp->u_arg[1]);
+                       printnum_ptr(tcp, addr);
                return 0;
        }
 
-       tprintf(", %#lx", tcp->u_arg[1]);
+       tprintf(", %#" PRI_klx, addr);
        return RVAL_DECODED;
 }
 #endif /* X86_64 || X32 */