netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / keyctl.c

diff --git a/keyctl.c b/keyctl.c
index 44ec827b79b1875e0dbceff02db622ae9e94dae5..3165fcd7e3a9c1763e7851493b26d8532c0a065d 100644 (file)
--- a/keyctl.c
+++ b/keyctl.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2014-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
@@ -59,7 +60,7 @@ SYS_FUNC(add_key)
        tprints(", ");
        printstrn(tcp, tcp->u_arg[2], tcp->u_arg[3]);
        /* payload length */
-       tprintf(", %" PRI_kru ", ", tcp->u_arg[3]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[3]);
        /* keyring serial number */
        print_keyring_serial_number(tcp->u_arg[4]);
 
@@ -268,10 +269,10 @@ keyctl_dh_compute(struct tcb *tcp, kernel_ulong_t params, kernel_ulong_t buf,
 SYS_FUNC(keyctl)
 {
        int cmd = tcp->u_arg[0];
-       kernel_ulong_t arg2 = getarg_klu(tcp, 1);
-       kernel_ulong_t arg3 = getarg_klu(tcp, 2);
-       kernel_ulong_t arg4 = getarg_klu(tcp, 3);
-       kernel_ulong_t arg5 = getarg_klu(tcp, 4);
+       kernel_ulong_t arg2 = tcp->u_arg[1];
+       kernel_ulong_t arg3 = tcp->u_arg[2];
+       kernel_ulong_t arg4 = tcp->u_arg[3];
+       kernel_ulong_t arg5 = tcp->u_arg[4];
 
        if (entering(tcp)) {
                printxval(keyctl_commands, cmd, "KEYCTL_???");