#include "xlat/key_spec.h"
+struct keyctl_dh_params {
+ int32_t private;
+ int32_t prime;
+ int32_t base;
+};
+
static void
print_keyring_serial_number(key_serial_t id)
{
- const char *str = xlookup(key_spec, id);
+ const char *str = xlookup(key_spec, (unsigned int) id);
if (str)
tprints(str);
SYS_FUNC(add_key)
{
/* type */
- printstr(tcp, tcp->u_arg[0], -1);
+ printstr(tcp, tcp->u_arg[0]);
/* description */
tprints(", ");
- printstr(tcp, tcp->u_arg[1], -1);
+ printstr(tcp, tcp->u_arg[1]);
/* payload */
tprints(", ");
- printstr(tcp, tcp->u_arg[2], tcp->u_arg[3]);
+ printstrn(tcp, tcp->u_arg[2], tcp->u_arg[3]);
/* payload length */
- tprintf(", %lu, ", tcp->u_arg[3]);
+ tprintf(", %" PRI_klu ", ", tcp->u_arg[3]);
/* keyring serial number */
print_keyring_serial_number(tcp->u_arg[4]);
SYS_FUNC(request_key)
{
/* type */
- printstr(tcp, tcp->u_arg[0], -1);
+ printstr(tcp, tcp->u_arg[0]);
/* description */
tprints(", ");
- printstr(tcp, tcp->u_arg[1], -1);
+ printstr(tcp, tcp->u_arg[1]);
/* callout_info */
tprints(", ");
- printstr(tcp, tcp->u_arg[2], -1);
+ printstr(tcp, tcp->u_arg[2]);
/* keyring serial number */
tprints(", ");
print_keyring_serial_number(tcp->u_arg[3]);
}
static void
-keyctl_update_key(struct tcb *tcp, key_serial_t id, long addr, long len)
+keyctl_update_key(struct tcb *tcp, key_serial_t id, kernel_ulong_t addr,
+ kernel_ulong_t len)
{
print_keyring_serial_number(id);
tprints(", ");
- printstr(tcp, addr, len);
- tprintf(", %lu", len);
+ printstrn(tcp, addr, len);
+ tprintf(", %llu", zero_extend_signed_to_ull(len));
}
static void
}
static void
-keyctl_read_key(struct tcb *tcp, key_serial_t id, long addr, long len)
+keyctl_read_key(struct tcb *tcp, key_serial_t id, kernel_ulong_t addr,
+ kernel_ulong_t len, bool has_nul)
{
if (entering(tcp)) {
print_keyring_serial_number(id);
if (syserror(tcp))
printaddr(addr);
else {
- long rval = tcp->u_rval > len ?
- len : (tcp->u_rval ? -1 : 0);
- printstr(tcp, addr, rval);
+ kernel_ulong_t rval = (tcp->u_rval >= 0) &&
+ ((kernel_ulong_t) tcp->u_rval > len) ? len :
+ (kernel_ulong_t) tcp->u_rval;
+ printstr_ex(tcp, addr, rval, has_nul ?
+ QUOTE_OMIT_TRAILING_0 : 0);
}
- tprintf(", %lu", len);
+ tprintf(", %llu", zero_extend_signed_to_ull(len));
}
}
static void
-keyctl_keyring_search(struct tcb *tcp, key_serial_t id1, long addr1,
- long addr2, key_serial_t id2)
+keyctl_keyring_search(struct tcb *tcp, key_serial_t id1, kernel_ulong_t addr1,
+ kernel_ulong_t addr2, key_serial_t id2)
{
print_keyring_serial_number(id1);
tprints(", ");
- printstr(tcp, addr1, -1);
+ printstr(tcp, addr1);
tprints(", ");
- printstr(tcp, addr2, -1);
+ printstr(tcp, addr2);
tprints(", ");
print_keyring_serial_number(id2);
}
static void
-keyctl_chown_key(struct tcb *tcp, key_serial_t id, int user, int group)
+keyctl_chown_key(struct tcb *tcp, key_serial_t id, unsigned user,
+ unsigned group)
{
print_keyring_serial_number(id);
- tprintf(", %d, %d", user, group);
+ printuid(", ", user);
+ printuid(", ", group);
}
static void
-keyctl_instantiate_key(struct tcb *tcp, key_serial_t id1, long addr,
- long len, key_serial_t id2)
+keyctl_instantiate_key(struct tcb *tcp, key_serial_t id1, kernel_ulong_t addr,
+ kernel_ulong_t len, key_serial_t id2)
{
print_keyring_serial_number(id1);
tprints(", ");
- printstr(tcp, addr, len);
- tprintf(", %lu, ", len);
+ printstrn(tcp, addr, len);
+ tprintf(", %llu, ", zero_extend_signed_to_ull(len));
print_keyring_serial_number(id2);
}
static void
keyctl_instantiate_key_iov(struct tcb *tcp, key_serial_t id1,
- long addr, long len, key_serial_t id2)
+ kernel_ulong_t addr, kernel_ulong_t len,
+ key_serial_t id2)
{
print_keyring_serial_number(id1);
tprints(", ");
- tprint_iov(tcp, len, addr, 1);
- tprintf(", %lu, ", len);
+ tprint_iov(tcp, len, addr, IOV_DECODE_STR);
+ tprintf(", %llu, ", zero_extend_signed_to_ull(len));
print_keyring_serial_number(id2);
}
keyctl_reject_key(struct tcb *tcp, key_serial_t id1, unsigned timeout,
unsigned error, key_serial_t id2)
{
+ const char *err_str = err_name(error);
+
print_keyring_serial_number(id1);
- tprintf(", %u, %u, ", timeout, error);
+ tprintf(", %u, ", timeout);
+
+ if (err_str)
+ tprintf("%s, ", err_str);
+ else
+ tprintf("%u, ", error);
+
print_keyring_serial_number(id2);
}
}
static void
-keyctl_get_persistent(struct tcb *tcp, int uid, key_serial_t id)
+keyctl_get_persistent(struct tcb *tcp, unsigned uid, key_serial_t id)
{
- tprintf("%d, ", uid);
+ printuid("", uid);
+ tprints(", ");
print_keyring_serial_number(id);
}
printflags(key_perms, perm, "KEY_???");
}
+static void
+print_dh_params(struct tcb *tcp, kernel_ulong_t addr)
+{
+ struct keyctl_dh_params params;
+
+ if (umove_or_printaddr(tcp, addr, ¶ms))
+ return;
+
+ tprints("{private=");
+ print_keyring_serial_number(params.private);
+ tprints(", prime=");
+ print_keyring_serial_number(params.prime);
+ tprints(", base=");
+ print_keyring_serial_number(params.base);
+ tprints("}");
+}
+
+static void
+keyctl_dh_compute(struct tcb *tcp, kernel_ulong_t params, kernel_ulong_t buf,
+ kernel_ulong_t len)
+{
+ if (entering(tcp)) {
+ print_dh_params(tcp, params);
+ tprints(", ");
+ } else {
+ if (syserror(tcp)) {
+ printaddr(buf);
+ } else {
+ kernel_ulong_t rval = (tcp->u_rval >= 0) &&
+ ((kernel_ulong_t) tcp->u_rval > len) ? len :
+ (kernel_ulong_t) tcp->u_rval;
+ printstrn(tcp, buf, rval);
+ }
+ tprintf(", %llu", zero_extend_signed_to_ull(len));
+ }
+}
+
#include "xlat/key_reqkeys.h"
#include "xlat/keyctl_commands.h"
SYS_FUNC(keyctl)
{
int cmd = tcp->u_arg[0];
+ 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_???");
- tprints(", ");
+
+ /*
+ * For now, KEYCTL_SESSION_TO_PARENT is the only cmd without
+ * arguments.
+ */
+ if (cmd != KEYCTL_SESSION_TO_PARENT)
+ tprints(", ");
}
switch (cmd) {
case KEYCTL_GET_KEYRING_ID:
- keyctl_get_keyring_id(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+ keyctl_get_keyring_id(tcp, arg2, arg3);
break;
case KEYCTL_JOIN_SESSION_KEYRING:
- printstr(tcp, tcp->u_arg[1], -1);
+ printstr(tcp, arg2);
break;
case KEYCTL_UPDATE:
- keyctl_update_key(tcp, tcp->u_arg[1],
- tcp->u_arg[2], tcp->u_arg[3]);
+ keyctl_update_key(tcp, arg2, arg3, arg4);
break;
case KEYCTL_REVOKE:
case KEYCTL_CLEAR:
case KEYCTL_INVALIDATE:
case KEYCTL_ASSUME_AUTHORITY:
- print_keyring_serial_number(tcp->u_arg[1]);
+ print_keyring_serial_number(arg2);
break;
case KEYCTL_LINK:
case KEYCTL_UNLINK:
- keyctl_handle_key_key(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+ keyctl_handle_key_key(tcp, arg2, arg3);
break;
case KEYCTL_DESCRIBE:
case KEYCTL_READ:
case KEYCTL_GET_SECURITY:
- keyctl_read_key(tcp, tcp->u_arg[1],
- tcp->u_arg[2], tcp->u_arg[3]);
+ keyctl_read_key(tcp, arg2, arg3, arg4, cmd != KEYCTL_READ);
return 0;
case KEYCTL_SEARCH:
- keyctl_keyring_search(tcp, tcp->u_arg[1], tcp->u_arg[2],
- tcp->u_arg[3], tcp->u_arg[4]);
+ keyctl_keyring_search(tcp, arg2, arg3, arg4, arg5);
break;
case KEYCTL_CHOWN:
- keyctl_chown_key(tcp, tcp->u_arg[1],
- tcp->u_arg[2], tcp->u_arg[3]);
+ keyctl_chown_key(tcp, arg2, arg3, arg4);
break;
case KEYCTL_SETPERM:
- keyctl_setperm_key(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+ keyctl_setperm_key(tcp, arg2, arg3);
break;
case KEYCTL_INSTANTIATE:
- keyctl_instantiate_key(tcp, tcp->u_arg[1], tcp->u_arg[2],
- tcp->u_arg[3], tcp->u_arg[4]);
+ keyctl_instantiate_key(tcp, arg2, arg3, arg4, arg5);
break;
case KEYCTL_NEGATE:
- keyctl_negate_key(tcp, tcp->u_arg[1],
- tcp->u_arg[2], tcp->u_arg[3]);
+ keyctl_negate_key(tcp, arg2, arg3, arg4);
break;
case KEYCTL_SET_REQKEY_KEYRING:
- printxval(key_reqkeys, tcp->u_arg[1], "KEY_REQKEY_DEFL_???");
+ printxval(key_reqkeys, arg2, "KEY_REQKEY_DEFL_???");
break;
case KEYCTL_SET_TIMEOUT:
- keyctl_set_timeout(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+ keyctl_set_timeout(tcp, arg2, arg3);
break;
case KEYCTL_SESSION_TO_PARENT:
break;
case KEYCTL_REJECT:
- keyctl_reject_key(tcp, tcp->u_arg[1], tcp->u_arg[2],
- tcp->u_arg[3], tcp->u_arg[4]);
+ keyctl_reject_key(tcp, arg2, arg3, arg4, arg5);
break;
case KEYCTL_INSTANTIATE_IOV:
- keyctl_instantiate_key_iov(tcp, tcp->u_arg[1],
- tcp->u_arg[2], tcp->u_arg[3],
- tcp->u_arg[4]);
+ keyctl_instantiate_key_iov(tcp, arg2, arg3, arg4, arg5);
break;
case KEYCTL_GET_PERSISTENT:
- keyctl_get_persistent(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+ keyctl_get_persistent(tcp, arg2, arg3);
break;
+ case KEYCTL_DH_COMPUTE:
+ keyctl_dh_compute(tcp, arg2, arg3, arg4);
+ return 0;
+
default:
- tprintf("%#lx, %#lx, %#lx, %#lx",
- tcp->u_arg[1], tcp->u_arg[2],
- tcp->u_arg[3], tcp->u_arg[4]);
+ tprintf("%#" PRI_klx ", %#" PRI_klx
+ ", %#" PRI_klx ", %#" PRI_klx,
+ arg2, arg3, arg4, arg5);
break;
}