diff for duplicates of <20210219225030.GA23520@altlinux.org> diff --git a/a/1.txt b/N1/1.txt index 54a95af..1f3a2e5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ Reproducer: getpid(), getppid(), pid); int status; if (wait(&status) < 0) { - if (errno = ECHILD) + if (errno == ECHILD) _exit(0); err(1, "wait"); } @@ -75,7 +75,8 @@ index a02363735915..3be653e40204 100644 /* Set the return value for the child. */ - childregs->u_regs[UREG_I0] = current->pid; -+ childregs->u_regs[UREG_I0] + task_pid_nr_ns(current, current->nsproxy->pid_ns_for_children); ++ childregs->u_regs[UREG_I0] = ++ task_pid_nr_ns(current, current->nsproxy->pid_ns_for_children); childregs->u_regs[UREG_I1] = 1; /* Set the return value for the parent. */ @@ -88,7 +89,8 @@ index 6f8c7822fc06..f53ef5cff46a 100644 /* Set the return value for the child. */ - t->kregs->u_regs[UREG_I0] = current->pid; -+ t->kregs->u_regs[UREG_I0] + task_pid_nr_ns(current, current->nsproxy->pid_ns_for_children); ++ t->kregs->u_regs[UREG_I0] = ++ task_pid_nr_ns(current, current->nsproxy->pid_ns_for_children); t->kregs->u_regs[UREG_I1] = 1; /* Set the second return value for the parent. */ diff --git a/a/content_digest b/N1/content_digest index bd3e31c..141c9a6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0m1tuq9nsnf.fsf@fess.ebiederm.org\0" "From\0Dmitry V. Levin <ldv@altlinux.org>\0" "Subject\0[PATCH v2] sparc: make copy_thread honor pid namespaces\0" - "Date\0Fri, 19 Feb 2021 22:50:30 +0000\0" + "Date\0Sat, 20 Feb 2021 01:50:30 +0300\0" "To\0David S. Miller <davem@davemloft.net>\0" "Cc\0Eric W. Biederman <ebiederm@xmission.com>" Alexey Gladkov <gladkov.alexey@gmail.com> @@ -44,7 +44,7 @@ " \t\tgetpid(), getppid(), pid);\n" " \tint status;\n" " \tif (wait(&status) < 0) {\n" - " \t\tif (errno = ECHILD)\n" + " \t\tif (errno == ECHILD)\n" " \t\t\t_exit(0);\n" " \t\terr(1, \"wait\");\n" " \t}\n" @@ -89,7 +89,8 @@ " \n" " \t/* Set the return value for the child. */\n" "-\tchildregs->u_regs[UREG_I0] = current->pid;\n" - "+\tchildregs->u_regs[UREG_I0] +\t\ttask_pid_nr_ns(current, current->nsproxy->pid_ns_for_children);\n" + "+\tchildregs->u_regs[UREG_I0] =\n" + "+\t\ttask_pid_nr_ns(current, current->nsproxy->pid_ns_for_children);\n" " \tchildregs->u_regs[UREG_I1] = 1;\n" " \n" " \t/* Set the return value for the parent. */\n" @@ -102,11 +103,12 @@ " \n" " \t/* Set the return value for the child. */\n" "-\tt->kregs->u_regs[UREG_I0] = current->pid;\n" - "+\tt->kregs->u_regs[UREG_I0] +\t\ttask_pid_nr_ns(current, current->nsproxy->pid_ns_for_children);\n" + "+\tt->kregs->u_regs[UREG_I0] =\n" + "+\t\ttask_pid_nr_ns(current, current->nsproxy->pid_ns_for_children);\n" " \tt->kregs->u_regs[UREG_I1] = 1;\n" " \n" " \t/* Set the second return value for the parent. */\n" "-- \n" ldv -a72741f3dd95aefc7ed957aa8fcd4022519fceea88a83b846d64ab16a7bd2260 +d9dcd652fd98f3b231fe963ca7b8187a49391402e72cad42320005834faa4603
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.