Fix the length argument passed from print_iovec to decode_netlink

[strace] / capability.c

diff --git a/capability.c b/capability.c
index 5daefa6cc40e6b6772498751f290d7e48ccef073..a3f06ea3356c153146a7d57ed279c8b978d407f6 100644 (file)
--- a/capability.c
+++ b/capability.c
@@ -52,19 +52,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;
 
@@ -78,7 +78,8 @@ 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 || !h) {
                printaddr(addr);
@@ -105,7 +106,8 @@ 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;
@@ -135,7 +137,7 @@ print_cap_data(struct tcb *tcp, unsigned long addr, const cap_user_header_t h)
 
 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]);
@@ -150,7 +152,8 @@ SYS_FUNC(capget)
 
 SYS_FUNC(capset)
 {
-       cap_user_header_t h = get_cap_header(tcp, tcp->u_arg[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);