]> granicus.if.org Git - strace/commitdiff
Cast tcp->u_rval to kernel_ureg_t instead of unsigned long
authorDmitry V. Levin <ldv@altlinux.org>
Sun, 25 Dec 2016 01:46:47 +0000 (01:46 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Sun, 25 Dec 2016 11:32:46 +0000 (11:32 +0000)
* fcntl.c (print_fcntl): Cast tcp->u_rval to kernel_ureg_t instead
of unsigned long.
* membarrier.c (SYS_FUNC(membarrier)): Likewise.
* prctl.c (SYS_FUNC(prctl)): Likewise.
* sched.c (SYS_FUNC(sched_getscheduler)): Likewise.
* time.c (do_adjtimex): Likewise.

fcntl.c
membarrier.c
prctl.c
sched.c
time.c

diff --git a/fcntl.c b/fcntl.c
index 9caa53afb5783646d2bd744800493bc5295f638e..f9379e62c07dcb01b870617e975e53f2b54ad411 100644 (file)
--- a/fcntl.c
+++ b/fcntl.c
@@ -143,7 +143,7 @@ print_fcntl(struct tcb *tcp)
                if (entering(tcp) || syserror(tcp) || tcp->u_rval == 0)
                        return 0;
                tcp->auxstr = sprintflags("flags ", fdflags,
-                                         (unsigned long) tcp->u_rval);
+                                         (kernel_ureg_t) tcp->u_rval);
                return RVAL_HEX | RVAL_STR;
        case F_GETFL:
                if (entering(tcp) || syserror(tcp))
@@ -171,13 +171,13 @@ print_fcntl(struct tcb *tcp)
        case F_GETLEASE:
                if (entering(tcp) || syserror(tcp))
                        return 0;
-               tcp->auxstr = xlookup(lockfcmds, (unsigned long) tcp->u_rval);
+               tcp->auxstr = xlookup(lockfcmds, (kernel_ureg_t) tcp->u_rval);
                return RVAL_HEX | RVAL_STR;
        case F_GET_SEALS:
                if (entering(tcp) || syserror(tcp) || tcp->u_rval == 0)
                        return 0;
                tcp->auxstr = sprintflags("seals ", f_seals,
-                                         (unsigned long) tcp->u_rval);
+                                         (kernel_ureg_t) tcp->u_rval);
                return RVAL_HEX | RVAL_STR;
        case F_GETSIG:
                if (entering(tcp) || syserror(tcp) || tcp->u_rval == 0)
index 3bc57648c292f4c1c54ac75ff24b48807f9bdf4f..1a49e595340e8c0424e132183a68f97309f982ee 100644 (file)
@@ -44,6 +44,6 @@ SYS_FUNC(membarrier)
                return 0;
 
        tcp->auxstr = sprintflags("", membarrier_cmds,
-                                 (unsigned long) tcp->u_rval);
+                                 (kernel_ureg_t) tcp->u_rval);
        return RVAL_HEX | RVAL_STR;
 }
diff --git a/prctl.c b/prctl.c
index ddf9a844295ad5f8830341ce2bb9d58561836e50..34f736bfec1c10124f9a303c63a0684ce1b5771f 100644 (file)
--- a/prctl.c
+++ b/prctl.c
@@ -113,7 +113,7 @@ SYS_FUNC(prctl)
                        break;
                if (syserror(tcp))
                        return 0;
-               tcp->auxstr = xlookup(pr_dumpable, (unsigned long) tcp->u_rval);
+               tcp->auxstr = xlookup(pr_dumpable, (kernel_ureg_t) tcp->u_rval);
                return RVAL_STR;
 
        case PR_GET_NAME:
@@ -144,7 +144,7 @@ SYS_FUNC(prctl)
                if (syserror(tcp) || tcp->u_rval == 0)
                        return 0;
                tcp->auxstr = sprintflags("", secbits,
-                                         (unsigned long) tcp->u_rval);
+                                         (kernel_ureg_t) tcp->u_rval);
                return RVAL_STR;
 
        case PR_GET_TID_ADDRESS:
@@ -180,7 +180,7 @@ SYS_FUNC(prctl)
                if (syserror(tcp) || tcp->u_rval == 0)
                        return 0;
                tcp->auxstr = sprintflags("", pr_fp_mode,
-                                         (unsigned long) tcp->u_rval);
+                                         (kernel_ureg_t) tcp->u_rval);
                return RVAL_STR;
 
        /* PR_TASK_PERF_EVENTS_* take no arguments. */
@@ -330,7 +330,7 @@ SYS_FUNC(prctl)
                if (syserror(tcp))
                        return 0;
                tcp->auxstr = xlookup(pr_mce_kill_policy,
-                                     (unsigned long) tcp->u_rval);
+                                     (kernel_ureg_t) tcp->u_rval);
                return tcp->auxstr ? RVAL_STR : RVAL_UDECIMAL;
 
        case PR_SET_FP_MODE:
diff --git a/sched.c b/sched.c
index 44b52714b7b53af79e9cd3cb761adec03a66f6f1..a9ff689eb23acee5f69ccf26eb01152d7b8ce76b 100644 (file)
--- a/sched.c
+++ b/sched.c
@@ -39,7 +39,7 @@ SYS_FUNC(sched_getscheduler)
        if (entering(tcp)) {
                tprintf("%d", (int) tcp->u_arg[0]);
        } else if (!syserror(tcp)) {
-               tcp->auxstr = xlookup(schedulers, (unsigned long) tcp->u_rval);
+               tcp->auxstr = xlookup(schedulers, (kernel_ureg_t) tcp->u_rval);
                if (tcp->auxstr != NULL)
                        return RVAL_STR;
        }
diff --git a/time.c b/time.c
index b1f4b4fc9ec66d69f08c0c5ea5cab80706fe727a..c208c29240d8fa47960c3e5ae2dee189aff2849e 100644 (file)
--- a/time.c
+++ b/time.c
@@ -171,7 +171,7 @@ do_adjtimex(struct tcb *const tcp, const kernel_ureg_t addr)
 {
        if (print_timex(tcp, addr))
                return 0;
-       tcp->auxstr = xlookup(adjtimex_state, (unsigned long) tcp->u_rval);
+       tcp->auxstr = xlookup(adjtimex_state, (kernel_ureg_t) tcp->u_rval);
        if (tcp->auxstr)
                return RVAL_STR;
        return 0;