Now that we have the appropriate save/restore position mechanism for
error handling in place, we can handle page faults on integer
copy-from-user by skipping the offending captured field entirely rather
than relying on an arbitrary 0 value.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I4ec6243d96753ce7e9c6230563713aeacb126567
break;
default:
WARN_ON_ONCE(1);
break;
default:
WARN_ON_ONCE(1);
}
ret = lttng_msgpack_end_map(writer);
}
ret = lttng_msgpack_end_map(writer);
-int64_t capture_sequence_element_signed(uint8_t *ptr,
- const struct lttng_kernel_type_integer *type)
+int capture_sequence_element_signed(uint8_t *ptr,
+ const struct lttng_kernel_type_integer *type,
+ int64_t *_value)
{
int64_t value = 0;
unsigned int size = type->size;
{
int64_t value = 0;
unsigned int size = type->size;
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int8_t)))
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int8_t)))
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int16_t)))
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int16_t)))
} else {
tmp = *(int16_t *) ptr;
}
} else {
tmp = *(int16_t *) ptr;
}
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int32_t)))
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int32_t)))
} else {
tmp = *(int32_t *) ptr;
}
} else {
tmp = *(int32_t *) ptr;
}
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int64_t)))
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int64_t)))
} else {
tmp = *(int64_t *) ptr;
}
} else {
tmp = *(int64_t *) ptr;
}
}
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
+ *_value = value;
+ return 0;
-uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
- const struct lttng_kernel_type_integer *type)
+int capture_sequence_element_unsigned(uint8_t *ptr,
+ const struct lttng_kernel_type_integer *type,
+ uint64_t *_value)
{
uint64_t value = 0;
unsigned int size = type->size;
{
uint64_t value = 0;
unsigned int size = type->size;
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint8_t)))
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint8_t)))
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint16_t)))
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint16_t)))
} else {
tmp = *(uint16_t *) ptr;
}
} else {
tmp = *(uint16_t *) ptr;
}
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint32_t)))
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint32_t)))
} else {
tmp = *(uint32_t *) ptr;
}
} else {
tmp = *(uint32_t *) ptr;
}
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint64_t)))
if (user) {
if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint64_t)))
} else {
tmp = *(uint64_t *) ptr;
}
} else {
tmp = *(uint64_t *) ptr;
}
}
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
+ *_value = value;
+ return 0;
}
int capture_sequence(struct lttng_msgpack_writer *writer,
}
int capture_sequence(struct lttng_msgpack_writer *writer,
signedness = integer_type->signedness;
for (i = 0; i < output->u.sequence.nr_elem; i++) {
if (signedness) {
signedness = integer_type->signedness;
for (i = 0; i < output->u.sequence.nr_elem; i++) {
if (signedness) {
- ret = lttng_msgpack_write_signed_integer(writer,
- capture_sequence_element_signed(ptr, integer_type));
+ int64_t v;
+
+ ret = capture_sequence_element_signed(ptr, integer_type, &v);
+ if (ret) {
+ goto end;
+ }
+ ret = lttng_msgpack_write_signed_integer(writer, v);
if (ret) {
goto end;
}
} else {
if (ret) {
goto end;
}
} else {
- ret = lttng_msgpack_write_unsigned_integer(writer,
- capture_sequence_element_unsigned(ptr, integer_type));
+ uint64_t v;
+
+ ret = capture_sequence_element_unsigned(ptr, integer_type, &v);
+ if (ret) {
+ goto end;
+ }
+ ret = lttng_msgpack_write_unsigned_integer(writer, v);