diff for duplicates of <20190125183359.GA8524@beast> diff --git a/a/1.txt b/N1/1.txt index f30a750..9277c49 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,10 +4,10 @@ actually exercising the errno evaluation -- it was just passing a literal (positive, 45000 in this case), and errno values (negative, -ESRCH in this case) to check both fake success and fake failure during syscall skipping. -Reported-by: Colin Ian King <colin.king@canonical.com> +Reported-by: Colin Ian King <colin.king at canonical.com> Fixes: a33b2d0359a0 ("selftests/seccomp: Add tests for basic ptrace actions") -Cc: stable@vger.kernel.org -Signed-off-by: Kees Cook <keescook@chromium.org> +Cc: stable at vger.kernel.org +Signed-off-by: Kees Cook <keescook at chromium.org> --- Colin, does this end up working on s390? Based on your bug report, I suspect the positive value tests will fail, but the errno tests will @@ -84,12 +84,12 @@ index 496a9a8c773a..7e632b465ab4 100644 @@ -1774,9 +1788,11 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee, nr = get_syscall(_metadata, tracee); - if (nr = __NR_getpid) + if (nr == __NR_getpid) - change_syscall(_metadata, tracee, __NR_getppid); + change_syscall(_metadata, tracee, __NR_getppid, 0); -+ if (nr = __NR_gettid) ++ if (nr == __NR_gettid) + change_syscall(_metadata, tracee, -1, 45000); - if (nr = __NR_openat) + if (nr == __NR_openat) - change_syscall(_metadata, tracee, -1); + change_syscall(_metadata, tracee, -1, -ESRCH); } diff --git a/a/content_digest b/N1/content_digest index 21dedec..d7baa5d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "From\0Kees Cook <keescook@chromium.org>\0" + "From\0keescook at chromium.org (Kees Cook)\0" "Subject\0[PATCH] selftests/seccomp: Enhance per-arch ptrace syscall skip tests\0" - "Date\0Fri, 25 Jan 2019 18:33:59 +0000\0" - "To\0kernel-janitors@vger.kernel.org\0" + "Date\0Fri, 25 Jan 2019 10:33:59 -0800\0" "\00:1\0" "b\0" "Passing EPERM during syscall skipping was confusing since the test wasn't\n" @@ -10,10 +9,10 @@ "(positive, 45000 in this case), and errno values (negative, -ESRCH in this\n" "case) to check both fake success and fake failure during syscall skipping.\n" "\n" - "Reported-by: Colin Ian King <colin.king@canonical.com>\n" + "Reported-by: Colin Ian King <colin.king at canonical.com>\n" "Fixes: a33b2d0359a0 (\"selftests/seccomp: Add tests for basic ptrace actions\")\n" - "Cc: stable@vger.kernel.org\n" - "Signed-off-by: Kees Cook <keescook@chromium.org>\n" + "Cc: stable at vger.kernel.org\n" + "Signed-off-by: Kees Cook <keescook at chromium.org>\n" "---\n" "Colin, does this end up working on s390? Based on your bug report, I\n" "suspect the positive value tests will fail, but the errno tests will\n" @@ -90,12 +89,12 @@ "@@ -1774,9 +1788,11 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee,\n" " \tnr = get_syscall(_metadata, tracee);\n" " \n" - " \tif (nr = __NR_getpid)\n" + " \tif (nr == __NR_getpid)\n" "-\t\tchange_syscall(_metadata, tracee, __NR_getppid);\n" "+\t\tchange_syscall(_metadata, tracee, __NR_getppid, 0);\n" - "+\tif (nr = __NR_gettid)\n" + "+\tif (nr == __NR_gettid)\n" "+\t\tchange_syscall(_metadata, tracee, -1, 45000);\n" - " \tif (nr = __NR_openat)\n" + " \tif (nr == __NR_openat)\n" "-\t\tchange_syscall(_metadata, tracee, -1);\n" "+\t\tchange_syscall(_metadata, tracee, -1, -ESRCH);\n" " }\n" @@ -183,4 +182,4 @@ "-- \n" Kees Cook -2f8eeede0ace5cca74e781cd946431ac5fd59e69911858e42d65fd72c8f31c77 +ba1d569569d415c46a1e34afc1f1ec7fe8cad9ad2933d48c78758d540e7dfe07
diff --git a/a/1.txt b/N2/1.txt index f30a750..9277c49 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -4,10 +4,10 @@ actually exercising the errno evaluation -- it was just passing a literal (positive, 45000 in this case), and errno values (negative, -ESRCH in this case) to check both fake success and fake failure during syscall skipping. -Reported-by: Colin Ian King <colin.king@canonical.com> +Reported-by: Colin Ian King <colin.king at canonical.com> Fixes: a33b2d0359a0 ("selftests/seccomp: Add tests for basic ptrace actions") -Cc: stable@vger.kernel.org -Signed-off-by: Kees Cook <keescook@chromium.org> +Cc: stable at vger.kernel.org +Signed-off-by: Kees Cook <keescook at chromium.org> --- Colin, does this end up working on s390? Based on your bug report, I suspect the positive value tests will fail, but the errno tests will @@ -84,12 +84,12 @@ index 496a9a8c773a..7e632b465ab4 100644 @@ -1774,9 +1788,11 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee, nr = get_syscall(_metadata, tracee); - if (nr = __NR_getpid) + if (nr == __NR_getpid) - change_syscall(_metadata, tracee, __NR_getppid); + change_syscall(_metadata, tracee, __NR_getppid, 0); -+ if (nr = __NR_gettid) ++ if (nr == __NR_gettid) + change_syscall(_metadata, tracee, -1, 45000); - if (nr = __NR_openat) + if (nr == __NR_openat) - change_syscall(_metadata, tracee, -1); + change_syscall(_metadata, tracee, -1, -ESRCH); } diff --git a/a/content_digest b/N2/content_digest index 21dedec..3deb227 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,6 @@ - "From\0Kees Cook <keescook@chromium.org>\0" + "From\0keescook@chromium.org (Kees Cook)\0" "Subject\0[PATCH] selftests/seccomp: Enhance per-arch ptrace syscall skip tests\0" - "Date\0Fri, 25 Jan 2019 18:33:59 +0000\0" - "To\0kernel-janitors@vger.kernel.org\0" + "Date\0Fri, 25 Jan 2019 10:33:59 -0800\0" "\00:1\0" "b\0" "Passing EPERM during syscall skipping was confusing since the test wasn't\n" @@ -10,10 +9,10 @@ "(positive, 45000 in this case), and errno values (negative, -ESRCH in this\n" "case) to check both fake success and fake failure during syscall skipping.\n" "\n" - "Reported-by: Colin Ian King <colin.king@canonical.com>\n" + "Reported-by: Colin Ian King <colin.king at canonical.com>\n" "Fixes: a33b2d0359a0 (\"selftests/seccomp: Add tests for basic ptrace actions\")\n" - "Cc: stable@vger.kernel.org\n" - "Signed-off-by: Kees Cook <keescook@chromium.org>\n" + "Cc: stable at vger.kernel.org\n" + "Signed-off-by: Kees Cook <keescook at chromium.org>\n" "---\n" "Colin, does this end up working on s390? Based on your bug report, I\n" "suspect the positive value tests will fail, but the errno tests will\n" @@ -90,12 +89,12 @@ "@@ -1774,9 +1788,11 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee,\n" " \tnr = get_syscall(_metadata, tracee);\n" " \n" - " \tif (nr = __NR_getpid)\n" + " \tif (nr == __NR_getpid)\n" "-\t\tchange_syscall(_metadata, tracee, __NR_getppid);\n" "+\t\tchange_syscall(_metadata, tracee, __NR_getppid, 0);\n" - "+\tif (nr = __NR_gettid)\n" + "+\tif (nr == __NR_gettid)\n" "+\t\tchange_syscall(_metadata, tracee, -1, 45000);\n" - " \tif (nr = __NR_openat)\n" + " \tif (nr == __NR_openat)\n" "-\t\tchange_syscall(_metadata, tracee, -1);\n" "+\t\tchange_syscall(_metadata, tracee, -1, -ESRCH);\n" " }\n" @@ -183,4 +182,4 @@ "-- \n" Kees Cook -2f8eeede0ace5cca74e781cd946431ac5fd59e69911858e42d65fd72c8f31c77 +04a827d5025203f893e565d3b46c30f6ece99f44019ee8e39ddef68f7744c4f4
diff --git a/a/1.txt b/N3/1.txt index f30a750..56f65d3 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -84,12 +84,12 @@ index 496a9a8c773a..7e632b465ab4 100644 @@ -1774,9 +1788,11 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee, nr = get_syscall(_metadata, tracee); - if (nr = __NR_getpid) + if (nr == __NR_getpid) - change_syscall(_metadata, tracee, __NR_getppid); + change_syscall(_metadata, tracee, __NR_getppid, 0); -+ if (nr = __NR_gettid) ++ if (nr == __NR_gettid) + change_syscall(_metadata, tracee, -1, 45000); - if (nr = __NR_openat) + if (nr == __NR_openat) - change_syscall(_metadata, tracee, -1); + change_syscall(_metadata, tracee, -1, -ESRCH); } diff --git a/a/content_digest b/N3/content_digest index 21dedec..7731bac 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,13 @@ "From\0Kees Cook <keescook@chromium.org>\0" "Subject\0[PATCH] selftests/seccomp: Enhance per-arch ptrace syscall skip tests\0" - "Date\0Fri, 25 Jan 2019 18:33:59 +0000\0" - "To\0kernel-janitors@vger.kernel.org\0" + "Date\0Fri, 25 Jan 2019 10:33:59 -0800\0" + "To\0Colin Ian King <colin.king@canonical.com>\0" + "Cc\0Andy Lutomirski <luto@amacapital.net>" + Will Drewry <wad@chromium.org> + Shuah Khan <shuah@kernel.org> + linux-kselftest@vger.kernel.org + kernel-janitors@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Passing EPERM during syscall skipping was confusing since the test wasn't\n" @@ -90,12 +96,12 @@ "@@ -1774,9 +1788,11 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee,\n" " \tnr = get_syscall(_metadata, tracee);\n" " \n" - " \tif (nr = __NR_getpid)\n" + " \tif (nr == __NR_getpid)\n" "-\t\tchange_syscall(_metadata, tracee, __NR_getppid);\n" "+\t\tchange_syscall(_metadata, tracee, __NR_getppid, 0);\n" - "+\tif (nr = __NR_gettid)\n" + "+\tif (nr == __NR_gettid)\n" "+\t\tchange_syscall(_metadata, tracee, -1, 45000);\n" - " \tif (nr = __NR_openat)\n" + " \tif (nr == __NR_openat)\n" "-\t\tchange_syscall(_metadata, tracee, -1);\n" "+\t\tchange_syscall(_metadata, tracee, -1, -ESRCH);\n" " }\n" @@ -183,4 +189,4 @@ "-- \n" Kees Cook -2f8eeede0ace5cca74e781cd946431ac5fd59e69911858e42d65fd72c8f31c77 +ac6c2541ce62bd8c56b3f9105ea64fac4419ac52303a2a4aa86bf3fe3b431ee3
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.