When Linux kernel merge window opens, changes of all sorts start to pour
down, breaking UAPI in various ways. This does not work for strace,
we need a stable UAPI.
* .gitlab-ci.yml (variables): Add KBRANCH.
* .travis.yml (env:global): Likewise.
Apparently, mips executables may invoke prctl(PR_GET_FP_MODE) on their
own. Since these calls are not filtered out by %creds, they have to be
dealt with before comparison.
* tests/getuid.test [$STRACE_ARCH == mips]: Filter out
prctl(PR_GET_FP_MODE) from the log of %creds tests.
Apparently, $SLEEP_A_BIT might be insufficient for the tracer
to complete.
* tests/strace-DD.test: Find out the tracer pid and wait for the tracer
completion before checking its log.
Suggested-by: Eugene Syromyatnikov <evgsyr@gmail.com>
Fixes: v5.4~106 "tests: check -DD and -DDD options"
getxxid used to test alpha-specific getxgid, getxuid, and getxgid
syscalls. Now each of these syscalls has its own test.
This hopefully fixes trace_creds test on alpha.
* tests/getxxid.c: Split into getxpid.c, getxuid.c, and getxgid.c.
* tests/gen_tests.in (getxxid): Remove.
(getxgid, getxpid, getxuid): New tests.
* tests/pure_executables.list: Replace getxxid with getxgid, getxpid,
and getxuid.
* tests/.gitignore: Likewise.
ia64: rename getpagesize syscall entry to old_getpagesize
... to match the Linux kernel that introduced __NR_old_getpagesize
by commit v5.0-rc1~164^2~4.
* linux/ia64/syscallent.h [BASE_NR + 147]: Rename "getpagesize"
to "old_getpagesize".
tests: disable umovestr_cached.test on mips o32 unless PTRACE_GET_SYSCALL_INFO works
If PTRACE_GET_SYSCALL_INFO does not work, then the test has to be
skipped on mips o32 because only the first four syscall arguments are
obtained from registers on that architecture, remaining syscall
arguments have to be fetched from the tracee memory.
* tests/umovestr_cached.test [$STRACE_ARCH == mips && $MIPS_ABI == o32]:
Skip the test if PTRACE_GET_SYSCALL_INFO does not work.
tests: re-enable umovestr_cached.test on ia64 if PTRACE_GET_SYSCALL_INFO works
If PTRACE_GET_SYSCALL_INFO works, then the exception made for ia64
earlier is not relevant.
* tests/umovestr_cached.test [$STRACE_ARCH == ia64]: Do not skip
the test if PTRACE_GET_SYSCALL_INFO works.
Complements: v5.3~23 "tests: disable umovestr_cached.test on ia64"
Introduced by Linux commit v5.6-rc1~122^2~4 and wired up in Linux commit
v5.6-rc1~122^2~3.
* pidfd_getfd.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* linux/syscallent-common.h ([BASE_NR + 438]): Wire up pidfd_getfd.
* tests/pidfd_getfd.c: New file.
* tests/pidfd_getfd-y.c: Likewise.
* tests/.gitignore: Add pidfd_getfd and pidfd_getfd-y.
* tests/pure_executables.list: Likewise.
* tests/gen_tests.in: Add pidfd_getfd and pidfd_getfd-y tests.
And rename it to print_pid_fd in an attempt to minimise confusion with
the kernel's pidfd concept.
* kcmp (PRINT_FIELD_PIDFD, SYS_FUNC(kcmp)): Change printpidfd calls to
print_pid_fd.
(printpidfd): Move it...
* util.c (print_pid_fd): ...here. Drop the static qualifier, update
the comment describing why this is a stub.
* defs.h (print_pid_fd): New declaration.
Introduced by Linux commit v5.6-rc1~133^2~2.
* configure.ac (AC_CHECK_HEADERS): Check for linux/openat2.h.
* defs.h (print_numeric_umode_t_64): New declaration.
* linux/syscallent-common.h ([BASE_NR + 437]): Wire up openat2.
* types/openat2.h: New file.
* open.c: Include "print_fields.h", "types/openat2.h",
and "xlat/open_resolve_flags.h".
(sprint_open_modes64): Rename from sprint_open_modes, change argument
type to uint64_t.
(sprint_open_modes): New function, a wrapper for sprint_open_modes64
with argument type of unsigned int.
(tprint_open_modes64): Rename from tprint_open_modes, change argument
type to uint64_t, call sprint_open_modes64 instead of sprint_open_modes.
(tprint_open_modes): New function, a wrapper for tprint_open_modes64
with an argument of type unsigned int.
(print_open_how): New function.
(SYS_FUNC(openat2)): New decoder.
* printmode.c (print_numeric_umode_t_64): New function.
* tests/openat2.c: New file.
* tests/openat2-Xabbrev.c: Likewise.
* tests/openat2-Xraw.c: Likewise.
* tests/openat2-Xverbose.c: Likewise.
* tests/openat2-v.c: Likewise.
* tests/openat2-v-y.c: Likewise.
* tests/openat2-v-y-Xabbrev.c: Likewise.
* tests/openat2-v-y-Xraw.c: Likewise.
* tests/openat2-v-y-Xverbose.c: Likewise.
* tests/openat2-y.c: Likewise.
* tests/.gitignore: Add openat2, openat2-Xabbrev, openat2-Xraw,
openat2-Xverbose, openat2-v, openat2-v-y, openat2-v-y-Xabbrev,
openat2-v-y-Xraw, openat2-v-y-Xverbose, openat2-y.
* tests/pure_executables.list: Likewise.
* tests/gen_tests.in: Add openat2, openat2-Xabbrev, openat2-Xraw,
openat2-Xverbose, openat2-v, openat2-v-y, openat2-v-y-Xabbrev,
openat2-v-y-Xraw, openat2-v-y-Xverbose, openat2-y tests.
* xlat/open_resolve_flags.in: New file.
As it is to be used elsewhere.
* clone.c (print_nonzero_bytes): Move it...
* util.c (print_nonzero_bytes): ...here. Remove static qualifier.
* defs.h (print_nonzero_bytes): New declaration.
Implement PTRACE_GETREGS API introduced on sh by Linux kernel commit
v2.6.28-rc1~99^2~56.
* configure.ac [sh]: Remove arch_enable_Werror=no.
* linux/sh/get_syscall_result.c: Remove.
* Makefile.am (EXTRA_DIST): Remove it.
* linux/sh/arch_regs.c (sh_regs): New variable.
(ARCH_REGS_FOR_GETREGS, ARCH_PC_REG, ARCH_SP_REG): New macros.
(sh_r0, ARCH_PC_PEEK_ADDR, ARCH_SP_PEEK_ADDR): Remove.
* linux/sh/arch_getrval2.c (getrval2): Use sh_regs.regs[1].
* linux/sh/get_error.c (arch_get_error): Use sh_regs.regs[0].
* linux/sh/get_scno.c (arch_get_scno): Use sh_regs.regs[3].
* linux/sh/get_syscall_args.c (arch_get_syscall_args): Use sh_regs.regs.
* linux/sh/set_error.c (arch_set_error, arch_set_success): Use
sh_regs.gr[0].
* linux/sh/set_scno.c (arch_set_scno): Use sh_regs.regs[3].
* NEWS: Mention this change.
v4l2: use PRINT_FIELD_* macros, add abbreviating in print_v4l2_queryctrl
* v4l2.c (print_v4l2_queryctrl): Use PRINT_FIELD_XVAL for the type field
printing; use PRINT_FIELD_D for minimum, maximum, step, and
default_value fields printing; use PRINT_FIELD_FLAGS for the flags field
printing; print minimum, maximum, step, default_value, and flags fields
only if abbrev(tcp) is not set.
* tests/ioctl_v4l2-success.c: Update expected output.
Suggested-by: Philippe De Muyter <phdm@macqel.be>
References: https://github.com/strace/strace/issues/63
v4l2: simplify print_v4l2_queryctrl and use print_v4l2_cid
Instead of fragile hacks aroung V4L2_CTRL_FLAG_NEXT_CTRL flag, (always)
save the id field on entering, restore it later on exiting, and print it
second time only if it has changed. That also simplifies the flow
with clear entering/exiting code parts separation.
The usage of print_v4l2_cid for id field printing has introduced several
(anticipated) output formatting changes, hence the changes in expected
output.
* v4l2.c (print_v4l2_queryctrl): Save c.id on entering, print it using
print_v4l2_cid with next_flags set to true, and return 0; remove
"entering(tcp) || get_tcb_priv_ulong(tcp)" logic; restore the entering
id value into entry_id variable on exiting, compare it to the exiting
c.id value and print c.id again if it is different; do not check if tcp
is exiting; always return RVAL_IOCTL_DECODED at the end of the function.
* tests/ioctl_v4l2.c: Update expected output.
* tests/ioctl_v4l2-success.c: Likewise.
v4l2: add support for V4L2_CTRL_FLAG_NEXT_* flags printing to print_v4l2_cid
* v4l2.c: Move "xlat/v4l2_control_query_flags.h" inclusion before
print_v4l2_cid.
(print_v4l2_cid): Remove const qualifier from cid, add bool next_flags
argument; print v4l2_control_query_flags and NAND them from cid if they
are present.
(print_v4l2_control): Pass false as next_flags to the print_v4l2_cid
call.
References: https://github.com/strace/strace/issues/63
Generate known flags mask and maximum string length.
* xlat.h (struct xlat): Add fields flags_strsz and flags_mask.
* xlat/gen.sh (print_xlat, print_xlat_pair): Add generation of
XLAT_VAL_n and XLAT_STR_n macros.
(gen_header): Generate flags_strsz and flags_mask fields' values using
the generated XLAT_VAL_n and XLAT_STR_n macros, undefine them
afterwards.
Print class ID as simple hex value in that case.
* v4l2.c (print_v4l2_cid): Print cid as hex and return if
xlat_verbose(xlat_verbosity) == XLAT_STYLE_RAW.
v4l2: use xsprintf instead of asprintf in print_v4l2_cid
Avoid an allocation and steamline code a bit.
* v4l2.c (print_v4l2_cid): Change tmp_str to a stack-allocated char array,
print to it with xsprintf, eliminate no longer needed free() call.
* types/v4l2.h (struct_v4l2_area, struct_v4l2_ext_control,
struct_v4l2_ext_controls): New type definitions.
* v4l2.c (print_v4l2_ext_control, print_v4l2_ext_controls): Do not guard
with VIDIOC_S_EXT_CTRLS anymore.
(v4l2_ioctl) <case VIDIOC_S_EXT_CTRLS, case VIDIOC_TRY_EXT_CTRLS, case
VIDIOC_G_EXT_CTRLS>: Likewise.
(print_v4l2_ext_control): Do not guard size and string field printing
with HAVE_STRUCT_V4L2_EXT_CONTROL_STRING.
* xlat/v4l2_ioctl_cmds.in (VIDIOC_G_EXT_CTRLS, VIDIOC_S_EXT_CTRLS,
VIDIOC_TRY_EXT_CTRLS): Uncomment.
References: https://bugzilla.redhat.com/show_bug.cgi?id=1758201
* configure.ac (AC_CHECK_TYPES): Check for struct v4l2_meta_format,
struct v4l2_pix_format_mplane, struct v4l2_plane_pix_format,
and struct v4l2_sdr_format.
* types/v4l2.h (struct_v4l2_clip, struct_v4l2_format): Typedef to an anonymous
type definition.
(struct_v4l2_pix_format, struct_v4l2_plane_pix_format,
struct_v4l2_pix_format_mplane, struct_v4l2_window,
struct_v4l2_vbi_format, struct_v4l2_sliced_vbi_format,
struct_v4l2_sliced_vbi_cap, struct_v4l2_sdr_format,
struct_v4l2_meta_format): New typedefs.
* v4l2.c (print_v4l2_format_fmt): Remove guard macros, decode
fmt.win.global_alpha and fmt.sdr.buffersize only when they are non-zero.
References: https://bugzilla.redhat.com/show_bug.cgi?id=1758201
* types/v4l2.h (struct_v4l2_capability): New typedef.
* v4l2.c: Check struct v4l2_capability
with CHECK_V4L2_STRUCT_RESERVED_SIZE.
(print_v4l2_capability): Change type of caps variable
to struct_v4l2_capability; drop HAVE_STRUCT_V4L2_CAPABILITY_DEVICE_CAPS
guard; print device_caps field only if it's non-zero.
References: https://bugzilla.redhat.com/show_bug.cgi?id=1758201
For now, only those that we support, and only for those we don't
conditionalise in code, since the fall-back definitions require
the relevant type definitions, and not all of them are always
available.
* xlat/v4l2_ioctl_cmds.in: New file.
* v4l2.c: Include "xlat/v4l2_ioctl_cmds.h" under XLAT_MACRO_ONLY
definition.
Some wrappers for common static_assert checks.
* v4l2.c (CHECK_V4L2_STRUCT_SIZE, CHECK_V4L2_RESERVED_SIZE.
CHECK_V4L2_STRUCT_RESERVED_SIZE): New macros.
References: https://bugzilla.redhat.com/show_bug.cgi?id=1758201
v4l2: use standard kernel version printing routine
The way kernel version is printed in print_v4l2_capability was
non-standard, didn't respect xlat styles, and was incorrect for major
values 256 and greater. Moreover, there is a routine that exists
specifically for this purpose now. Let's use it and solve all
the aforementioned issues.
* v4l2.c (print_v4l2_capability): Use print_kernel_version for the
kernel version printing.
* tests/ioctl_v4l2-success.c: Update the expected output.
It makes little sense to conditionalise this test, since it bundles
all the required definitions and types in case of absense of them
in the kernel headers.
* tests/ioctl_perf-success.c: Remove HAVE_LINUX_PERF_EVENT_H guard,
update directives' indentation.
(include <linux/perf_event.h>): Put under HAVE_LINUX_PERF_EVENT_H guard.
v4l2: comment unknown tuner types with "V4L2_TUNER_???" and not "V4L2_TUNER_TYPE_???"
All the xlat constants include only "V4L2_TUNER_" part.
* v4l2.c (print_v4l2_tuner) <printxval(v4l2_tuner_types, ...)>: Change
the last argument from V4L2_TUNER_TYPE_???" to "V4L2_TUNER_???"
v4l2: print exiting structure fields as a separate structure
To conform with the output formatting in other places.
* v4l2.c (print_v4l2_format, print_v4l2_streamparm): Close the structure
with "}" before the arrow and open it again with "{".
v4l2: print struct v4l2_outputparm.outputmode using v4l2_capture_modes flags
As it is treated the same way as struct v4l2_captureparm.capturemode.
* v4l2.c (print_v4l2_streamparm): Print struct
v4l2_outputparm.outputmode using v4l2_capture_modes flags.
v4l2: print struct v4l2_{capture,output}parm.extendedmode as hex
As it is likely to be treated similarly to capturemode/outputmode, which
are bit sets.
* v4l2.c (print_v4l2_streamparm): Print extendedmode field as hex.
* tests/ioctl_v4l2.c: Update expected output.
Dmitry V. Levin
Gleb Fotengauer-Malinovskiy
Eugene Syromyatnikov