]> granicus.if.org Git - strace/blobdiff - mem.c
io: change size types from unsigned long to kernel_ureg_t
[strace] / mem.c
diff --git a/mem.c b/mem.c
index 1f37826fc6c0d872a0ceeb379a13ce8f3b11167b..4c4377eae7ca651f0c4956f3f7e7a823798ea50a 100644 (file)
--- a/mem.c
+++ b/mem.c
@@ -55,23 +55,23 @@ SYS_FUNC(brk)
 #include "xlat/mmap_flags.h"
 
 static void
-print_mmap(struct tcb *tcp, long *u_arg, unsigned long long offset)
+print_mmap(struct tcb *tcp, kernel_ureg_t *u_arg, unsigned long long offset)
 {
-       const unsigned long addr = u_arg[0];
-       const unsigned long len = u_arg[1];
-       const unsigned long prot = u_arg[2];
-       const unsigned long flags = u_arg[3];
+       const kernel_ureg_t addr = u_arg[0];
+       const kernel_ureg_t len = u_arg[1];
+       const kernel_ureg_t prot = u_arg[2];
+       const kernel_ureg_t flags = u_arg[3];
        const int fd = u_arg[4];
 
        printaddr(addr);
        tprintf(", %lu, ", len);
-       printflags(mmap_prot, prot, "PROT_???");
+       printflags64(mmap_prot, prot, "PROT_???");
        tprints(", ");
 #ifdef MAP_TYPE
-       printxval(mmap_flags, flags & MAP_TYPE, "MAP_???");
+       printxval64(mmap_flags, flags & MAP_TYPE, "MAP_???");
        addflags(mmap_flags, flags & ~MAP_TYPE);
 #else
-       printflags(mmap_flags, flags, "MAP_???");
+       printflags64(mmap_flags, flags, "MAP_???");
 #endif
        tprints(", ");
        printfd(tcp, fd);
@@ -93,8 +93,8 @@ print_mmap(struct tcb *tcp, long *u_arg, unsigned long long offset)
 /* Params are pointed to by u_arg[0], offset is in bytes */
 SYS_FUNC(old_mmap)
 {
-       long u_arg[6];
-# if defined AARCH64 || defined X86_64
+       kernel_ureg_t u_arg[6];
+# ifndef current_klongsize
        /* We are here only in a 32-bit personality. */
        unsigned int narrow_arg[6];
        if (umove_or_printaddr(tcp, tcp->u_arg[0], &narrow_arg))
@@ -106,39 +106,40 @@ SYS_FUNC(old_mmap)
        if (umove_or_printaddr(tcp, tcp->u_arg[0], &u_arg))
                return RVAL_DECODED | RVAL_HEX;
 # endif
-       print_mmap(tcp, u_arg, (unsigned long) u_arg[5]);
+       print_mmap(tcp, u_arg, u_arg[5]);
 
        return RVAL_DECODED | RVAL_HEX;
 }
 #endif /* old_mmap architectures */
 
-#if defined(S390)
+#ifdef S390
 /* Params are pointed to by u_arg[0], offset is in pages */
 SYS_FUNC(old_mmap_pgoff)
 {
-       long u_arg[5];
+       kernel_ureg_t u_arg[5];
        int i;
-       unsigned narrow_arg[6];
+       unsigned int narrow_arg[6];
        unsigned long long offset;
-       if (umoven(tcp, tcp->u_arg[0], sizeof(narrow_arg), narrow_arg) == -1)
-               return 0;
+       if (umove_or_printaddr(tcp, tcp->u_arg[0], &narrow_arg))
+               return RVAL_DECODED | RVAL_HEX;
        for (i = 0; i < 5; i++)
-               u_arg[i] = (unsigned long) narrow_arg[i];
+               u_arg[i] = narrow_arg[i];
        offset = narrow_arg[5];
        offset *= get_pagesize();
        print_mmap(tcp, u_arg, offset);
 
        return RVAL_DECODED | RVAL_HEX;
 }
-#endif
+#endif /* S390 */
 
 /* Params are passed directly, offset is in bytes */
 SYS_FUNC(mmap)
 {
-       unsigned long long offset = (unsigned long) tcp->u_arg[5];
-#if defined(LINUX_MIPSN32) || defined(X32)
-       /* Try test/x32_mmap.c */
-       offset = tcp->ext_arg[5];
+       unsigned long long offset =
+#if HAVE_STRUCT_TCB_EXT_ARG
+               tcp->ext_arg[5];        /* try test/x32_mmap.c */
+#else
+               tcp->u_arg[5];
 #endif
        /* Example of kernel-side handling of this variety of mmap:
         * arch/x86/kernel/sys_x86_64.c::SYSCALL_DEFINE6(mmap, ...) calls
@@ -155,7 +156,7 @@ SYS_FUNC(mmap_pgoff)
 {
        /* Try test/mmap_offset_decode.c */
        unsigned long long offset;
-       offset = (unsigned long) tcp->u_arg[5];
+       offset = tcp->u_arg[5];
        offset *= get_pagesize();
        print_mmap(tcp, tcp->u_arg, offset);
 
@@ -166,7 +167,7 @@ SYS_FUNC(mmap_pgoff)
 SYS_FUNC(mmap_4koff)
 {
        unsigned long long offset;
-       offset = (unsigned long) tcp->u_arg[5];
+       offset = tcp->u_arg[5];
        offset <<= 12;
        print_mmap(tcp, tcp->u_arg, offset);
 
@@ -181,22 +182,36 @@ SYS_FUNC(munmap)
        return RVAL_DECODED;
 }
 
-SYS_FUNC(mprotect)
+static int
+do_mprotect(struct tcb *tcp, bool has_pkey)
 {
-       printaddr(tcp->u_arg[0]);
-       tprintf(", %lu, ", tcp->u_arg[1]);
-       printflags(mmap_prot, tcp->u_arg[2], "PROT_???");
+       printaddr_klu(getarg_klu(tcp, 0));
+       tprintf(", %" PRI_klu ", ", getarg_klu(tcp, 1));
+       printflags64(mmap_prot, getarg_klu(tcp, 2), "PROT_???");
+
+       if (has_pkey)
+               tprintf(", %d", (int) tcp->u_arg[3]);
 
        return RVAL_DECODED;
 }
 
+SYS_FUNC(mprotect)
+{
+       return do_mprotect(tcp, false);
+}
+
+SYS_FUNC(pkey_mprotect)
+{
+       return do_mprotect(tcp, true);
+}
+
 #include "xlat/mremap_flags.h"
 
 SYS_FUNC(mremap)
 {
        printaddr(tcp->u_arg[0]);
        tprintf(", %lu, %lu, ", tcp->u_arg[1], tcp->u_arg[2]);
-       printflags(mremap_flags, tcp->u_arg[3], "MREMAP_???");
+       printflags64(mremap_flags, tcp->u_arg[3], "MREMAP_???");
 #ifdef MREMAP_FIXED
        if ((tcp->u_arg[3] & (MREMAP_MAYMOVE | MREMAP_FIXED)) ==
            (MREMAP_MAYMOVE | MREMAP_FIXED)) {
@@ -272,6 +287,8 @@ SYS_FUNC(mincore)
                        unsigned long i;
                        tprints("[");
                        for (i = 0; i < len; i++) {
+                               if (i)
+                                       tprints(", ");
                                if (abbrev(tcp) && i >= max_strlen) {
                                        tprints("...");
                                        break;
@@ -295,248 +312,48 @@ SYS_FUNC(getpagesize)
 
 SYS_FUNC(remap_file_pages)
 {
-       const unsigned long addr = tcp->u_arg[0];
-       const unsigned long size = tcp->u_arg[1];
-       const unsigned long prot = tcp->u_arg[2];
-       const unsigned long pgoff = tcp->u_arg[3];
-       const unsigned long flags = tcp->u_arg[4];
+       const kernel_ureg_t addr = tcp->u_arg[0];
+       const kernel_ureg_t size = tcp->u_arg[1];
+       const kernel_ureg_t prot = tcp->u_arg[2];
+       const kernel_ureg_t pgoff = tcp->u_arg[3];
+       const kernel_ureg_t flags = tcp->u_arg[4];
 
        printaddr(addr);
        tprintf(", %lu, ", size);
-       printflags(mmap_prot, prot, "PROT_???");
+       printflags64(mmap_prot, prot, "PROT_???");
        tprintf(", %lu, ", pgoff);
 #ifdef MAP_TYPE
-       printxval(mmap_flags, flags & MAP_TYPE, "MAP_???");
+       printxval64(mmap_flags, flags & MAP_TYPE, "MAP_???");
        addflags(mmap_flags, flags & ~MAP_TYPE);
 #else
-       printflags(mmap_flags, flags, "MAP_???");
+       printflags64(mmap_flags, flags, "MAP_???");
 #endif
 
        return RVAL_DECODED;
 }
 
-#define MPOL_DEFAULT    0
-#define MPOL_PREFERRED  1
-#define MPOL_BIND       2
-#define MPOL_INTERLEAVE 3
-
-#define MPOL_F_NODE     (1<<0)
-#define MPOL_F_ADDR     (1<<1)
-
-#define MPOL_MF_STRICT  (1<<0)
-#define MPOL_MF_MOVE   (1<<1)
-#define MPOL_MF_MOVE_ALL (1<<2)
-
-#include "xlat/policies.h"
-#include "xlat/mbindflags.h"
-#include "xlat/mempolicyflags.h"
-#include "xlat/move_pages_flags.h"
-
-static void
-get_nodes(struct tcb *tcp, unsigned long ptr, unsigned long maxnodes, int err)
-{
-       unsigned long nlongs, size, end;
-
-       nlongs = (maxnodes + 8 * sizeof(long) - 1) / (8 * sizeof(long));
-       size = nlongs * sizeof(long);
-       end = ptr + size;
-       if (nlongs == 0 || ((err || verbose(tcp)) && (size * 8 == maxnodes)
-                           && (end > ptr))) {
-               unsigned long n, cur, abbrev_end;
-               int failed = 0;
-
-               if (abbrev(tcp)) {
-                       abbrev_end = ptr + max_strlen * sizeof(long);
-                       if (abbrev_end < ptr)
-                               abbrev_end = end;
-               } else {
-                       abbrev_end = end;
-               }
-               tprints(", {");
-               for (cur = ptr; cur < end; cur += sizeof(long)) {
-                       if (cur > ptr)
-                               tprints(", ");
-                       if (cur >= abbrev_end) {
-                               tprints("...");
-                               break;
-                       }
-                       if (umoven(tcp, cur, sizeof(n), &n) < 0) {
-                               tprints("?");
-                               failed = 1;
-                               break;
-                       }
-                       tprintf("%#0*lx", (int) sizeof(long) * 2 + 2, n);
-               }
-               tprints("}");
-               if (failed) {
-                       tprints(" ");
-                       printaddr(ptr);
-               }
-       } else {
-               tprints(" ");
-               printaddr(ptr);
-       }
-       tprintf(", %lu", maxnodes);
-}
-
-SYS_FUNC(mbind)
-{
-       printaddr(tcp->u_arg[0]);
-       tprintf(", %lu, ", tcp->u_arg[1]);
-       printxval(policies, tcp->u_arg[2], "MPOL_???");
-       get_nodes(tcp, tcp->u_arg[3], tcp->u_arg[4], 0);
-       tprints(", ");
-       printflags(mbindflags, tcp->u_arg[5], "MPOL_???");
-
-       return RVAL_DECODED;
-}
-
-SYS_FUNC(set_mempolicy)
+#if defined(POWERPC)
+static bool
+print_protmap_entry(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       printxval(policies, tcp->u_arg[0], "MPOL_???");
-       get_nodes(tcp, tcp->u_arg[1], tcp->u_arg[2], 0);
+       tprintf("%#08x", * (unsigned int *) elem_buf);
 
-       return RVAL_DECODED;
-}
-
-SYS_FUNC(get_mempolicy)
-{
-       if (exiting(tcp)) {
-               int pol;
-               if (!umove_or_printaddr(tcp, tcp->u_arg[0], &pol))
-                       printxval(policies, pol, "MPOL_???");
-               get_nodes(tcp, tcp->u_arg[1], tcp->u_arg[2], syserror(tcp));
-               tprints(", ");
-               printaddr(tcp->u_arg[3]);
-               tprints(", ");
-               printflags(mempolicyflags, tcp->u_arg[4], "MPOL_???");
-       }
-       return 0;
+       return true;
 }
 
-SYS_FUNC(migrate_pages)
+SYS_FUNC(subpage_prot)
 {
-       tprintf("%ld, ", (long) (pid_t) tcp->u_arg[0]);
-       get_nodes(tcp, tcp->u_arg[2], tcp->u_arg[1], 0);
-       tprints(", ");
-       get_nodes(tcp, tcp->u_arg[3], tcp->u_arg[1], 0);
-
-       return RVAL_DECODED;
-}
+       kernel_ureg_t addr = tcp->u_arg[0];
+       kernel_ureg_t len = tcp->u_arg[1];
+       kernel_ureg_t nmemb = len >> 16;
+       kernel_ureg_t map = tcp->u_arg[2];
 
-SYS_FUNC(move_pages)
-{
-       if (entering(tcp)) {
-               unsigned long npages = tcp->u_arg[1];
-               tprintf("%ld, %lu, ", tcp->u_arg[0], npages);
-               if (tcp->u_arg[2] == 0)
-                       tprints("NULL, ");
-               else {
-                       unsigned int i;
-                       long puser = tcp->u_arg[2];
-                       tprints("{");
-                       for (i = 0; i < npages; ++i) {
-                               void *p;
-                               if (i > 0)
-                                       tprints(", ");
-                               if (umove(tcp, puser, &p) < 0) {
-                                       tprints("???");
-                                       break;
-                               }
-                               tprintf("%p", p);
-                               puser += sizeof(void *);
-                       }
-                       tprints("}, ");
-               }
-               if (tcp->u_arg[3] == 0)
-                       tprints("NULL, ");
-               else {
-                       unsigned int i;
-                       long nodeuser = tcp->u_arg[3];
-                       tprints("{");
-                       for (i = 0; i < npages; ++i) {
-                               int node;
-                               if (i > 0)
-                                       tprints(", ");
-                               if (umove(tcp, nodeuser, &node) < 0) {
-                                       tprints("???");
-                                       break;
-                               }
-                               tprintf("%#x", node);
-                               nodeuser += sizeof(int);
-                       }
-                       tprints("}, ");
-               }
-       } else {
-               unsigned long npages = tcp->u_arg[1];
-               if (tcp->u_arg[4] == 0)
-                       tprints("NULL, ");
-               else {
-                       unsigned int i;
-                       long statususer = tcp->u_arg[4];
-                       tprints("{");
-                       for (i = 0; i < npages; ++i) {
-                               int status;
-                               if (i > 0)
-                                       tprints(", ");
-                               if (umove(tcp, statususer, &status) < 0) {
-                                       tprints("???");
-                                       break;
-                               }
-                               tprintf("%#x", status);
-                               statususer += sizeof(int);
-                       }
-                       tprints("}, ");
-               }
-               printflags(move_pages_flags, tcp->u_arg[5], "MPOL_???");
-       }
-       return 0;
-}
+       printaddr(addr);
+       tprintf(", %lu, ", len);
 
-#if defined(POWERPC)
-SYS_FUNC(subpage_prot)
-{
-       unsigned long cur, end, abbrev_end, entries;
        unsigned int entry;
-
-       printaddr(tcp->u_arg[0]);
-       tprints(", ");
-       printaddr(tcp->u_arg[1]);
-       tprints(", ");
-       entries = tcp->u_arg[1] >> 16;
-       if (!entries || !tcp->u_arg[2]) {
-               tprints("{}");
-               return 0;
-       }
-       cur = tcp->u_arg[2];
-       end = cur + (sizeof(int) * entries);
-       if (!verbose(tcp) || end < (unsigned long) tcp->u_arg[2]) {
-               printaddr(tcp->u_arg[2]);
-               return 0;
-       }
-       if (abbrev(tcp)) {
-               abbrev_end = cur + (sizeof(int) * max_strlen);
-               if (abbrev_end > end)
-                       abbrev_end = end;
-       }
-       else
-               abbrev_end = end;
-       tprints("{");
-       for (; cur < end; cur += sizeof(int)) {
-               if (cur > (unsigned long) tcp->u_arg[2])
-                       tprints(", ");
-               if (cur >= abbrev_end) {
-                       tprints("...");
-                       break;
-               }
-               if (umove(tcp, cur, &entry) < 0) {
-                       tprintf("??? [%#lx]", cur);
-                       break;
-               }
-               else
-                       tprintf("%#08x", entry);
-       }
-       tprints("}");
+       print_array(tcp, map, nmemb, &entry, sizeof(entry),
+                   umoven_or_printaddr, print_protmap_entry, 0);
 
        return RVAL_DECODED;
 }