diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c index 9fad61468..a928c72c3 100644 --- a/compel/arch/s390/src/lib/infect.c +++ b/compel/arch/s390/src/lib/infect.c @@ -196,13 +196,13 @@ int get_vx_regs(pid_t pid, user_fpregs_struct_t *fpregs) pr_debug("VXRS registers not supported\n"); return 0; } - pr_perror("Couldn't get VXRS_LOW\n"); + pr_perror("Couldn't get VXRS_LOW"); return -1; } iov.iov_base = &fpregs->vxrs_high; iov.iov_len = sizeof(fpregs->vxrs_high); if (ptrace(PTRACE_GETREGSET, pid, NT_S390_VXRS_HIGH, &iov) < 0) { - pr_perror("Couldn't get VXRS_HIGH\n"); + pr_perror("Couldn't get VXRS_HIGH"); return -1; } fpregs->flags |= USER_FPREGS_VXRS; @@ -243,7 +243,7 @@ int get_gs_cb(pid_t pid, user_fpregs_struct_t *fpregs) pr_debug("GS_BC not set\n"); return 0; } - pr_perror("Couldn't get GS_BC\n"); + pr_perror("Couldn't get GS_BC"); return -1; } fpregs->flags |= USER_GS_BC; @@ -274,7 +274,7 @@ int get_ri_cb(pid_t pid, user_fpregs_struct_t *fpregs) pr_debug("RI_CB not set\n"); return 0; default: - pr_perror("Couldn't get RI_CB\n"); + pr_perror("Couldn't get RI_CB"); return -1; } } @@ -386,14 +386,14 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs) iov.iov_base = &ext_regs->vxrs_low; iov.iov_len = sizeof(ext_regs->vxrs_low); if (ptrace(PTRACE_SETREGSET, pid, NT_S390_VXRS_LOW, &iov) < 0) { - pr_perror("Couldn't set VXRS_LOW\n"); + pr_perror("Couldn't set VXRS_LOW"); ret = -1; } iov.iov_base = &ext_regs->vxrs_high; iov.iov_len = sizeof(ext_regs->vxrs_high); if (ptrace(PTRACE_SETREGSET, pid, NT_S390_VXRS_HIGH, &iov) < 0) { - pr_perror("Couldn't set VXRS_HIGH\n"); + pr_perror("Couldn't set VXRS_HIGH"); ret = -1; } } @@ -402,13 +402,13 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs) iov.iov_base = &ext_regs->gs_cb; iov.iov_len = sizeof(ext_regs->gs_cb); if (ptrace(PTRACE_SETREGSET, pid, NT_S390_GS_CB, &iov) < 0) { - pr_perror("Couldn't set GS_CB\n"); + pr_perror("Couldn't set GS_CB"); ret = -1; } iov.iov_base = &ext_regs->gs_bc; iov.iov_len = sizeof(ext_regs->gs_bc); if (ptrace(PTRACE_SETREGSET, pid, NT_S390_GS_BC, &iov) < 0) { - pr_perror("Couldn't set GS_BC\n"); + pr_perror("Couldn't set GS_BC"); ret = -1; } } @@ -417,7 +417,7 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs) iov.iov_base = &ext_regs->ri_cb; iov.iov_len = sizeof(ext_regs->ri_cb); if (ptrace(PTRACE_SETREGSET, pid, NT_S390_RI_CB, &iov) < 0) { - pr_perror("Couldn't set RI_CB\n"); + pr_perror("Couldn't set RI_CB"); ret = -1; } } diff --git a/compel/arch/x86/src/lib/thread_area.c b/compel/arch/x86/src/lib/thread_area.c index f581496a7..3ff5dc5d4 100644 --- a/compel/arch/x86/src/lib/thread_area.c +++ b/compel/arch/x86/src/lib/thread_area.c @@ -64,7 +64,7 @@ int __compel_arch_fetch_thread_area(int tid, struct thread_ctx *th) if (err == -EIO && native_mode) return 0; if (err) { - pr_perror("get_thread_area failed for %d\n", tid); + pr_perror("get_thread_area failed for %d", tid); return err; } } diff --git a/criu/arch/x86/kerndat.c b/criu/arch/x86/kerndat.c index 94c954e1e..cb7a2aa05 100644 --- a/criu/arch/x86/kerndat.c +++ b/criu/arch/x86/kerndat.c @@ -224,7 +224,7 @@ int kdat_x86_has_ptrace_fpu_xsave_bug(void) * waitpid() may end with ECHILD if SIGCHLD == SIG_IGN, * and the child has stopped already. */ - pr_perror("Failed to wait for %s() test\n", __func__); + pr_perror("Failed to wait for %s() test", __func__); goto out_kill; } diff --git a/criu/cr-restore.c b/criu/cr-restore.c index 53eddba6b..6da80f031 100644 --- a/criu/cr-restore.c +++ b/criu/cr-restore.c @@ -1224,7 +1224,7 @@ static int wait_exiting_children(void) futex_dec_and_wake(&task_entries->nr_in_progress); if (waitid(P_ALL, 0, &info, WEXITED | WNOWAIT)) { - pr_perror("Failed to wait\n"); + pr_perror("Failed to wait"); return -1; } diff --git a/criu/fdstore.c b/criu/fdstore.c index 7c8eb7208..40c4b90cd 100644 --- a/criu/fdstore.c +++ b/criu/fdstore.c @@ -93,7 +93,7 @@ int fdstore_add(int fd) ret = send_fd(sk, NULL, 0, fd); if (ret) { - pr_perror("Can't send fd %d into store\n", fd); + pr_perror("Can't send fd %d into store", fd); mutex_unlock(&desc->lock); return -1; } diff --git a/criu/file-lock.c b/criu/file-lock.c index 050954cde..f6601c974 100644 --- a/criu/file-lock.c +++ b/criu/file-lock.c @@ -479,7 +479,7 @@ static int open_break_cb(int ns_root_fd, struct reg_file_info *rfi, void *arg) close(fd); return -1; } else if (errno != EWOULDBLOCK) { - pr_perror("Can't break lease\n"); + pr_perror("Can't break lease"); return -1; } return 0; @@ -512,7 +512,7 @@ static int set_file_lease(int fd, int type) struct stat st; if (fstat(fd, &st)) { - pr_perror("Can't get file stat (%i)\n", fd); + pr_perror("Can't get file stat (%i)", fd); return -1; } @@ -524,7 +524,7 @@ static int set_file_lease(int fd, int type) ret = fcntl(fd, F_SETLEASE, type); if (ret < 0) - pr_perror("Can't set lease\n"); + pr_perror("Can't set lease"); setfsuid(old_fsuid); return ret; @@ -589,20 +589,20 @@ static int restore_file_lease(FileLockEntry *fle) signum_fcntl = fcntl(fle->fd, F_GETSIG); signum = signum_fcntl ? signum_fcntl : SIGIO; if (signum_fcntl < 0) { - pr_perror("Can't get file i/o signum\n"); + pr_perror("Can't get file i/o signum"); return -1; } if (sigemptyset(&blockmask) || sigaddset(&blockmask, signum) || sigprocmask(SIG_BLOCK, &blockmask, &oldmask)) { - pr_perror("Can't block file i/o signal\n"); + pr_perror("Can't block file i/o signal"); return -1; } ret = restore_breaking_file_lease(fle); if (sigprocmask(SIG_SETMASK, &oldmask, NULL)) { - pr_perror("Can't restore sigmask\n"); + pr_perror("Can't restore sigmask"); ret = -1; } return ret; diff --git a/criu/kerndat.c b/criu/kerndat.c index df7eb070f..21fcb620d 100644 --- a/criu/kerndat.c +++ b/criu/kerndat.c @@ -1045,7 +1045,7 @@ static bool kerndat_has_clone3_set_tid(void) if (pid == -1 && errno == EINVAL) { kdat.has_clone3_set_tid = true; } else { - pr_perror("Unexpected error from clone3\n"); + pr_perror("Unexpected error from clone3"); return -1; } diff --git a/criu/vdso.c b/criu/vdso.c index 433a54728..b8a28dd63 100644 --- a/criu/vdso.c +++ b/criu/vdso.c @@ -471,12 +471,12 @@ static int vdso_mmap_compat(struct vdso_maps *native, goto out_kill; if (kill(pid, SIGCONT)) { - pr_perror("Failed to kill(SIGCONT) for compat vdso helper\n"); + pr_perror("Failed to kill(SIGCONT) for compat vdso helper"); goto out_kill; } if (write(fds[1], &compat->vdso_start, sizeof(void *)) != sizeof(compat->vdso_start)) { - pr_perror("Failed write to pipe\n"); + pr_perror("Failed write to pipe"); goto out_kill; } waitpid(pid, &status, WUNTRACED); diff --git a/test/zdtm/lib/test.c b/test/zdtm/lib/test.c index e031357ac..e848091c1 100644 --- a/test/zdtm/lib/test.c +++ b/test/zdtm/lib/test.c @@ -372,7 +372,7 @@ int test_wait_pre_dump(void) if (read(criu_status_in, &ret, sizeof(ret)) != sizeof(ret)) { if (errno != EBADF || !futex_get(&sig_received)) - pr_perror("Can't wait pre-dump\n"); + pr_perror("Can't wait pre-dump"); return -1; } pr_err("pre-dump\n"); diff --git a/test/zdtm/static/cgroup_ifpriomap.c b/test/zdtm/static/cgroup_ifpriomap.c index f043b365b..24ed44f14 100644 --- a/test/zdtm/static/cgroup_ifpriomap.c +++ b/test/zdtm/static/cgroup_ifpriomap.c @@ -105,7 +105,7 @@ static int read_one_priomap(char *prop_line, struct ifpriomap_t *out) out->ifname = malloc(len + 1); if (!out->ifname) { - pr_perror("malloc() failed\n"); + pr_perror("malloc() failed"); return -1; } diff --git a/test/zdtm/static/epoll.c b/test/zdtm/static/epoll.c index ce3b176d3..ed2609a07 100644 --- a/test/zdtm/static/epoll.c +++ b/test/zdtm/static/epoll.c @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) uint8_t cw = 1, cr; if (write(pipes[i].pipefd[1], &cw, sizeof(cw)) != sizeof(cw)) { - pr_perror("Unable to write into a pipe\n"); + pr_perror("Unable to write into a pipe"); return 1; } diff --git a/test/zdtm/static/epoll01.c b/test/zdtm/static/epoll01.c index 0f5a4fda8..23d536123 100644 --- a/test/zdtm/static/epoll01.c +++ b/test/zdtm/static/epoll01.c @@ -92,7 +92,7 @@ int main(int argc, char *argv[]) uint8_t cw = 1, cr; if (write(pipes[i].pipefd[1], &cw, sizeof(cw)) != sizeof(cw)) { - pr_perror("Unable to write into a pipe\n"); + pr_perror("Unable to write into a pipe"); return 1; } diff --git a/test/zdtm/static/file_lease00.c b/test/zdtm/static/file_lease00.c index 8413f831b..226e73abc 100644 --- a/test/zdtm/static/file_lease00.c +++ b/test/zdtm/static/file_lease00.c @@ -41,7 +41,7 @@ static int check_lease_type(int fd, int expected_type) if (lease_type != expected_type) { if (lease_type < 0) - pr_perror("Can't acquire lease type\n"); + pr_perror("Can't acquire lease type"); else pr_err("Mismatched lease type: %i\n", lease_type); return -1; @@ -64,7 +64,7 @@ int main(int argc, char **argv) } if (fcntl(fd_rd, F_SETLEASE, F_RDLCK) < 0 || fcntl(fd_wr, F_SETLEASE, F_WRLCK) < 0) { - pr_perror("Can't set leases\n"); + pr_perror("Can't set leases"); close_files(fd_rd, fd_wr); return -1; } diff --git a/test/zdtm/static/file_lease01.c b/test/zdtm/static/file_lease01.c index 90fa74a1c..047bca705 100644 --- a/test/zdtm/static/file_lease01.c +++ b/test/zdtm/static/file_lease01.c @@ -44,7 +44,7 @@ static int check_lease_type(int fd, int expected_type) if (lease_type != expected_type) { if (lease_type < 0) - pr_perror("Can't acquire lease type\n"); + pr_perror("Can't acquire lease type"); else pr_err("Mismatched lease type: %i\n", lease_type); return -1; diff --git a/test/zdtm/static/file_lease02.c b/test/zdtm/static/file_lease02.c index cd7945d31..3afb458f9 100644 --- a/test/zdtm/static/file_lease02.c +++ b/test/zdtm/static/file_lease02.c @@ -39,7 +39,7 @@ static int check_lease_type(int fd, int expected_type) if (lease_type != expected_type) { if (lease_type < 0) - pr_perror("Can't acquire lease type\n"); + pr_perror("Can't acquire lease type"); else pr_err("Mismatched lease type: %i\n", lease_type); return -1; @@ -54,15 +54,15 @@ static int prepare_file(char *file, int file_type, int break_type) fd = open(file, file_type | O_CREAT, 0666); if (fd < 0) { - pr_perror("Can't open file (type %i)\n", file_type); + pr_perror("Can't open file (type %i)", file_type); return fd; } if (fcntl(fd, F_SETLEASE, lease_type) < 0) { - pr_perror("Can't set exclusive lease\n"); + pr_perror("Can't set exclusive lease"); goto err; } if (fcntl(fd, F_SETSIG, BREAK_SIGNUM) < 0) { - pr_perror("Can't set signum for file i/o\n"); + pr_perror("Can't set signum for file i/o"); goto err; } @@ -74,7 +74,7 @@ static int prepare_file(char *file, int file_type, int break_type) pr_err("Conflicting lease not found\n"); goto err; } else if (errno != EWOULDBLOCK) { - pr_perror("Can't break lease\n"); + pr_perror("Can't break lease"); goto err; } return fd; @@ -114,7 +114,7 @@ int main(int argc, char **argv) if (sigemptyset(&act.sa_mask) || sigaddset(&act.sa_mask, BREAK_SIGNUM) || sigaction(BREAK_SIGNUM, &act, NULL)) { - pr_perror("Can't set signal action\n"); + pr_perror("Can't set signal action"); fail(); return -1; } diff --git a/test/zdtm/static/file_lease03.c b/test/zdtm/static/file_lease03.c index 4cde2b655..eeb33d245 100644 --- a/test/zdtm/static/file_lease03.c +++ b/test/zdtm/static/file_lease03.c @@ -34,7 +34,7 @@ static int check_lease_type(int fd, int expected_type) if (lease_type != expected_type) { if (lease_type < 0) - pr_perror("Can't acquire lease type\n"); + pr_perror("Can't acquire lease type"); else pr_err("Mismatched lease type: %i\n", lease_type); return -1; @@ -49,15 +49,15 @@ static int prepare_file(char *file, int file_type, int break_type) fd = open(file, file_type | O_CREAT, 0666); if (fd < 0) { - pr_perror("Can't open file (type %i)\n", file_type); + pr_perror("Can't open file (type %i)", file_type); return fd; } if (fcntl(fd, F_SETLEASE, lease_type) < 0) { - pr_perror("Can't set exclusive lease\n"); + pr_perror("Can't set exclusive lease"); goto err; } if (fcntl(fd, F_SETSIG, BREAK_SIGNUM) < 0) { - pr_perror("Can't set signum for file i/o\n"); + pr_perror("Can't set signum for file i/o"); goto err; } @@ -69,7 +69,7 @@ static int prepare_file(char *file, int file_type, int break_type) pr_err("Conflicting lease not found\n"); goto err; } else if (errno != EWOULDBLOCK) { - pr_perror("Can't break lease\n"); + pr_perror("Can't break lease"); goto err; } return fd; @@ -92,7 +92,7 @@ int main(int argc, char **argv) if (sigemptyset(&act.sa_mask) || sigaddset(&act.sa_mask, BREAK_SIGNUM) || sigaction(BREAK_SIGNUM, &act, NULL)) { - pr_perror("Can't set signal action\n"); + pr_perror("Can't set signal action"); return -1; } @@ -114,7 +114,7 @@ int main(int argc, char **argv) ret = fd_dup = dup(fd); if (fd_dup < 0) { - pr_perror("Can't dup fd\n"); + pr_perror("Can't dup fd"); goto done; } diff --git a/test/zdtm/static/file_lease04.c b/test/zdtm/static/file_lease04.c index c924f6c5d..10fbc6b2a 100644 --- a/test/zdtm/static/file_lease04.c +++ b/test/zdtm/static/file_lease04.c @@ -34,7 +34,7 @@ static int check_lease_type(int fd, int expected_type) if (lease_type != expected_type) { if (lease_type < 0) - pr_perror("Can't acquire lease type\n"); + pr_perror("Can't acquire lease type"); else pr_err("Mismatched lease type: %i\n", lease_type); return -1; @@ -49,15 +49,15 @@ static int prepare_file(char *file, int file_type, int break_type) fd = open(file, file_type | O_CREAT, 0666); if (fd < 0) { - pr_perror("Can't open file (type %i)\n", file_type); + pr_perror("Can't open file (type %i)", file_type); return fd; } if (fcntl(fd, F_SETLEASE, lease_type) < 0) { - pr_perror("Can't set exclusive lease\n"); + pr_perror("Can't set exclusive lease"); goto err; } if (fcntl(fd, F_SETSIG, BREAK_SIGNUM) < 0) { - pr_perror("Can't set signum for file i/o\n"); + pr_perror("Can't set signum for file i/o"); goto err; } @@ -69,7 +69,7 @@ static int prepare_file(char *file, int file_type, int break_type) pr_err("Conflicting lease not found\n"); goto err; } else if (errno != EWOULDBLOCK) { - pr_perror("Can't break lease\n"); + pr_perror("Can't break lease"); goto err; } return fd; @@ -92,7 +92,7 @@ int main(int argc, char **argv) if (sigemptyset(&act.sa_mask) || sigaddset(&act.sa_mask, BREAK_SIGNUM) || sigaction(BREAK_SIGNUM, &act, NULL)) { - pr_perror("Can't set signal action\n"); + pr_perror("Can't set signal action"); return -1; } diff --git a/test/zdtm/static/file_locks06.c b/test/zdtm/static/file_locks06.c index 780fb07ea..e7f4c6293 100644 --- a/test/zdtm/static/file_locks06.c +++ b/test/zdtm/static/file_locks06.c @@ -36,10 +36,10 @@ int init_lock(int *fd, struct flock *lck) void cleanup(int *fd) { if (close(*fd)) - pr_perror("Can't close fd\n"); + pr_perror("Can't close fd"); if (unlink(filename)) - pr_perror("Can't unlink file\n"); + pr_perror("Can't unlink file"); } int main(int argc, char **argv) diff --git a/test/zdtm/static/file_locks07.c b/test/zdtm/static/file_locks07.c index 2fe169fcf..fcbfbf1d4 100644 --- a/test/zdtm/static/file_locks07.c +++ b/test/zdtm/static/file_locks07.c @@ -59,10 +59,10 @@ void cleanup(void) for (i = 0; i < FILE_NUM; ++i) if (close(fds[i])) - pr_perror("Can't close fd\n"); + pr_perror("Can't close fd"); if (unlink(filename)) - pr_perror("Can't unlink file failed\n"); + pr_perror("Can't unlink file failed"); } int check_file_locks_restored(void) diff --git a/test/zdtm/static/file_locks08.c b/test/zdtm/static/file_locks08.c index fea8d9e7e..214c90788 100644 --- a/test/zdtm/static/file_locks08.c +++ b/test/zdtm/static/file_locks08.c @@ -38,10 +38,10 @@ int init_file_lock(int *fd, struct flock *lck) void cleanup(int *fd) { if (close(*fd)) - pr_perror("Can't close fd\n"); + pr_perror("Can't close fd"); if (unlink(filename)) - pr_perror("Can't unlink file\n"); + pr_perror("Can't unlink file"); } int main(int argc, char **argv) diff --git a/test/zdtm/static/fpu00.c b/test/zdtm/static/fpu00.c index 6f2e1c2bf..150b404f2 100644 --- a/test/zdtm/static/fpu00.c +++ b/test/zdtm/static/fpu00.c @@ -92,12 +92,12 @@ int main(int argc, char ** argv) void *ret; if (pthread_create(&child, NULL, &run_fpu_test, NULL)) { - pr_perror("Can't create pthread\n"); + pr_perror("Can't create pthread"); exit(1); } if (pthread_join(child, &ret)) { - pr_perror("Can't join pthread\n"); + pr_perror("Can't join pthread"); exit(1); } diff --git a/test/zdtm/static/seccomp_filter_threads.c b/test/zdtm/static/seccomp_filter_threads.c index 63ea4b5bd..f3ca235df 100644 --- a/test/zdtm/static/seccomp_filter_threads.c +++ b/test/zdtm/static/seccomp_filter_threads.c @@ -153,7 +153,7 @@ int main(int argc, char ** argv) MAP_ANONYMOUS | MAP_SHARED, -1, 0); if (wait_rdy == MAP_FAILED || wait_run == MAP_FAILED) { - pr_perror("mmap failed\n"); + pr_perror("mmap failed"); exit(1); } diff --git a/test/zdtm/static/sk-unix-mntns.c b/test/zdtm/static/sk-unix-mntns.c index 58f63797a..3e480db81 100644 --- a/test/zdtm/static/sk-unix-mntns.c +++ b/test/zdtm/static/sk-unix-mntns.c @@ -78,12 +78,12 @@ int main(int argc, char *argv[]) sk = socket(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0); if (sk < 0) { - pr_perror("socket\n"); + pr_perror("socket"); exit(1); } csk = socket(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0); if (csk < 0) { - pr_perror("socket\n"); + pr_perror("socket"); exit(1); } @@ -133,7 +133,7 @@ int main(int argc, char *argv[]) close(csk); csk = socket(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0); if (csk < 0) { - pr_perror("socket\n"); + pr_perror("socket"); exit(1); } if (connect(csk, (struct sockaddr *) &addr, addrlen)) { diff --git a/test/zdtm/static/sock_peercred.c b/test/zdtm/static/sock_peercred.c index 069cc52f7..46a3312c5 100644 --- a/test/zdtm/static/sock_peercred.c +++ b/test/zdtm/static/sock_peercred.c @@ -53,7 +53,7 @@ static int child_func(void *fd_p) /* If sks[1] == fd, the below closes it, but we don't care */ if (dup2(sks[0], fd) == -1) { - pr_perror("Can't dup fd\n"); + pr_perror("Can't dup fd"); return 1; } @@ -100,7 +100,7 @@ int main(int argc, char **argv) } if (wait(&status) == -1 || status) { - pr_perror("wait error: status=%d\n", status); + pr_perror("wait error: status=%d", status); goto out; } diff --git a/test/zdtm/static/socket-ext.c b/test/zdtm/static/socket-ext.c index 333fb8ce2..88e70559f 100644 --- a/test/zdtm/static/socket-ext.c +++ b/test/zdtm/static/socket-ext.c @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) test_waitsig(); if (unlink(path)) { - pr_perror("Unable to remove %s\n", path); + pr_perror("Unable to remove %s", path); return 1; } if (rmdir(dir)) { diff --git a/test/zdtm/static/socket-tcp-close-wait.c b/test/zdtm/static/socket-tcp-close-wait.c index 3e3462bff..2efa89b17 100644 --- a/test/zdtm/static/socket-tcp-close-wait.c +++ b/test/zdtm/static/socket-tcp-close-wait.c @@ -126,7 +126,7 @@ int main(int argc, char **argv) close(pfd[1]); if (read(pfd[0], &port, sizeof(port)) != sizeof(port)) { - pr_perror("Can't read port\n"); + pr_perror("Can't read port"); return 1; } close(pfd[0]); diff --git a/test/zdtm/static/socket-tcp-close0.c b/test/zdtm/static/socket-tcp-close0.c index c23c3d688..a411b6e0d 100644 --- a/test/zdtm/static/socket-tcp-close0.c +++ b/test/zdtm/static/socket-tcp-close0.c @@ -25,7 +25,7 @@ static int check_socket_closed(int sk) err = getsockopt(sk, IPPROTO_TCP, TCP_INFO, (void *)&info, &len); if (err != 0) { - pr_perror("Can't get socket state\n"); + pr_perror("Can't get socket state"); return -1; } else if (info.tcpi_state != TCP_CLOSE) { pr_err("Invalid socket state (%i)", (int)info.tcpi_state); diff --git a/test/zdtm/static/socket-tcp-close1.c b/test/zdtm/static/socket-tcp-close1.c index 3dba4e54d..1fefeea82 100644 --- a/test/zdtm/static/socket-tcp-close1.c +++ b/test/zdtm/static/socket-tcp-close1.c @@ -21,7 +21,7 @@ static int check_socket_state(int sk, int state) err = getsockopt(sk, IPPROTO_TCP, TCP_INFO, (void *)&info, &len); if (err != 0) { - pr_perror("Can't get socket state\n"); + pr_perror("Can't get socket state"); return -1; } return info.tcpi_state == state ? 0 : -1; diff --git a/test/zdtm/static/thread_different_uid_gid.c b/test/zdtm/static/thread_different_uid_gid.c index 1a6cdc976..e229d91ed 100644 --- a/test/zdtm/static/thread_different_uid_gid.c +++ b/test/zdtm/static/thread_different_uid_gid.c @@ -39,19 +39,19 @@ void *chg_uid_gid(void *arg) newcaps = cap_from_text("cap_setgid,cap_setuid=+eip"); if (!newcaps) { - pr_perror("Failed to get capability struct\n"); + pr_perror("Failed to get capability struct"); exit(1); } ret = cap_set_proc(newcaps); if (ret) { - pr_perror("Failed to set capabilities for the process\n"); + pr_perror("Failed to set capabilities for the process"); exit(1); } mycaps = cap_get_proc(); if (!mycaps) { - pr_perror("Failed to get child thread capabilities\n"); + pr_perror("Failed to get child thread capabilities"); exit_group(2); } @@ -62,7 +62,7 @@ void *chg_uid_gid(void *arg) if (ret >= 0) { syscall(SYS_setresuid, uid, uid, uid); } else if (ret < 0) { - pr_perror("Failed to change UID/GID\n"); + pr_perror("Failed to change UID/GID"); exit_group(2); } @@ -103,17 +103,17 @@ int main(int argc, char **argv) newcaps = cap_from_text("cap_setgid,cap_setuid=+eip"); if (!newcaps) { - pr_perror("Failed to get capability struct\n"); + pr_perror("Failed to get capability struct"); exit(1); } ret = cap_set_proc(newcaps); if (ret) { - pr_perror("Failed to set capabilities for the process\n"); + pr_perror("Failed to set capabilities for the process"); exit(1); } ret = prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0); if (ret) { - pr_perror("Unable to set KEEPCAPS\n"); + pr_perror("Unable to set KEEPCAPS"); exit(1); } @@ -132,12 +132,12 @@ int main(int argc, char **argv) if (ret >= 0) { ret = syscall(SYS_setresuid, mainuser, mainuser, mainuser); } else if (ret < 0) { - pr_perror("Failed to drop privileges\n"); + pr_perror("Failed to drop privileges"); exit(1); } test_msg("Now main thread runs as UID: %d; GID: %d\n", getuid(), getgid()); if (gid == getgid() || uid == getuid()) { - pr_perror("Thread credentials match\n"); + pr_perror("Thread credentials match"); exit(1); } test_msg("Main thread is waiting for signal\n"); @@ -146,7 +146,7 @@ int main(int argc, char **argv) test_waitsig(); if (gid == getgid() || uid == getuid()) { - pr_perror("Thread credentials match after restore\n"); + pr_perror("Thread credentials match after restore"); exit(1); }