netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / capability.c

diff --git a/capability.c b/capability.c
index 26d9c66aaad55c0a71ca18b4e35bd2683ffe797d..760bddace49a268445d9a91592f91a01351e92d4 100644 (file)
--- a/capability.c
+++ b/capability.c
@@ -1,3 +1,33 @@
+/*
+ * Copyright (c) 2000 Wichert Akkerman <wakkerma@debian.org>
+ * Copyright (c) 2011 Denys Vlasenko <dvlasenk@redhat.com>
+ * Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2017 The strace developers.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "defs.h"
 
 /* these constants are the same as in <linux/capability.h> */
@@ -23,19 +53,19 @@ enum {
 
 #include "xlat/cap_version.h"
 
-typedef struct user_cap_header_struct {
+struct user_cap_header_struct {
        uint32_t version;
        int pid;
-} *cap_user_header_t;
+};
 
-typedef struct user_cap_data_struct {
+struct user_cap_data_struct {
        uint32_t effective;
        uint32_t permitted;
        uint32_t inheritable;
-} *cap_user_data_t;
+};
 
-static cap_user_header_t
-get_cap_header(struct tcb *tcp, unsigned long addr)
+static const struct user_cap_header_struct *
+get_cap_header(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        static struct user_cap_header_struct header;
 
@@ -49,22 +79,18 @@ get_cap_header(struct tcb *tcp, unsigned long addr)
 }
 
 static void
-print_cap_header(struct tcb *tcp, unsigned long addr, cap_user_header_t h)
+print_cap_header(struct tcb *const tcp, const kernel_ulong_t addr,
+                const struct user_cap_header_struct *const h)
 {
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-
-       if (!h) {
-               tprintf("%#lx", addr);
+       if (!addr || !h) {
+               printaddr(addr);
                return;
        }
 
-       tprints("{");
+       tprints("{version=");
        printxval(cap_version, h->version,
                  "_LINUX_CAPABILITY_VERSION_???");
-       tprintf(", %d}", h->pid);
+       tprintf(", pid=%d}", h->pid);
 }
 
 static void
@@ -81,19 +107,14 @@ print_cap_bits(const uint32_t lo, const uint32_t hi)
 }
 
 static void
-print_cap_data(struct tcb *tcp, unsigned long addr, const cap_user_header_t h)
+print_cap_data(struct tcb *const tcp, const kernel_ulong_t addr,
+              const struct user_cap_header_struct *const h)
 {
        struct user_cap_data_struct data[2];
        unsigned int len;
 
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-
-       if (!h || !verbose(tcp) ||
-           (exiting(tcp) && syserror(tcp))) {
-               tprintf("%#lx", addr);
+       if (!addr || !h) {
+               printaddr(addr);
                return;
        }
 
@@ -103,24 +124,21 @@ print_cap_data(struct tcb *tcp, unsigned long addr, const cap_user_header_t h)
        else
                len = 1;
 
-       if (umoven(tcp, addr, len * sizeof(data[0]), data) < 0) {
-               tprintf("%#lx", addr);
+       if (umoven_or_printaddr(tcp, addr, len * sizeof(data[0]), data))
                return;
-       }
 
-       tprints("{");
+       tprints("{effective=");
        print_cap_bits(data[0].effective, len > 1 ? data[1].effective : 0);
-       tprints(", ");
+       tprints(", permitted=");
        print_cap_bits(data[0].permitted, len > 1 ? data[1].permitted : 0);
-       tprints(", ");
+       tprints(", inheritable=");
        print_cap_bits(data[0].inheritable, len > 1 ? data[1].inheritable : 0);
        tprints("}");
 }
 
-int
-sys_capget(struct tcb *tcp)
+SYS_FUNC(capget)
 {
-       cap_user_header_t h;
+       const struct user_cap_header_struct *h;
 
        if (entering(tcp)) {
                h = get_cap_header(tcp, tcp->u_arg[0]);
@@ -133,14 +151,13 @@ sys_capget(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_capset(struct tcb *tcp)
+SYS_FUNC(capset)
 {
-       if (entering(tcp)) {
-               cap_user_header_t h = get_cap_header(tcp, tcp->u_arg[0]);
-               print_cap_header(tcp, tcp->u_arg[0], h);
-               tprints(", ");
-               print_cap_data(tcp, tcp->u_arg[1], h);
-       }
-       return 0;
+       const struct user_cap_header_struct *const h =
+               get_cap_header(tcp, tcp->u_arg[0]);
+       print_cap_header(tcp, tcp->u_arg[0], h);
+       tprints(", ");
+       print_cap_data(tcp, tcp->u_arg[1], h);
+
+       return RVAL_DECODED;
 }