From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AC59C54791 for ; Wed, 13 Mar 2024 18:56:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D1FB7940026; Wed, 13 Mar 2024 14:56:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CCF60940010; Wed, 13 Mar 2024 14:56:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B97D5940026; Wed, 13 Mar 2024 14:56:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id ABE0F940010 for ; Wed, 13 Mar 2024 14:56:19 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 53898C0EF2 for ; Wed, 13 Mar 2024 18:56:19 +0000 (UTC) X-FDA: 81892921278.07.BB8B054 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by imf19.hostedemail.com (Postfix) with ESMTP id 84BB31A0008 for ; Wed, 13 Mar 2024 18:56:16 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=H7qTQrTl; spf=pass (imf19.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.178 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710356176; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=5XAsXiIDC6OwZ+FdvxFgNYuLvw56oPhd3QbM/5nEMps=; b=S8pEG9e+Jf5bn433gTa19caq4E4387dX1Jcs6NqZJKmFxfoqyEtM7I9oWtj1lS0Eyfjurp Eb/uu+XdW1dSK+iIwk80twpswDMpNEQfQ7H38AjloRcklWU+i0eTIk2C5o+s85ICNb31Dv 4ABYVyY9XvUchlD8n+w2bMJ7IsSNJug= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=H7qTQrTl; spf=pass (imf19.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.178 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710356176; a=rsa-sha256; cv=none; b=SvQWoJIfAF62ozE3f0xnhE/UmLMOtDuUNS7A1cgUUWeduu3HVOdokhqHDxmbLfCHIpqZTB DKL4U0gLrLHwhnfe+h6ryYuWwp7RuOFHQ4+gb9XXg0yFWYmaMZZ918u6FmIS8/4UFDaFN3 FzPrAKYGcxrKFCHs41z4RsmemTwQFsw= Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6e6b22af648so1067961b3a.0 for ; Wed, 13 Mar 2024 11:56:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1710356175; x=1710960975; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5XAsXiIDC6OwZ+FdvxFgNYuLvw56oPhd3QbM/5nEMps=; b=H7qTQrTl9wii1lYG9txxAkzVJ/UojzIgtHFcreoKYxMWgHr3kt3/DZdPZRClRLHeNQ ZCo43kMcjXjjO/CSiyTIpGjmkLL9nOcgASLU/sXiRL1xT1LkYGhkDK6n5FPcMUXZs4sK xi+m+NkDRyFBCxkU0eOuWScTaDKwYYWSIE8O4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710356175; x=1710960975; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5XAsXiIDC6OwZ+FdvxFgNYuLvw56oPhd3QbM/5nEMps=; b=bgwRFMTvxmitQT1hsG7kRTjSGqXL1XOcY9BsFuNRwy+jA43UzlvEiiHyBd0+T7Ys1L 8eG/nQYMm2yn9NrxR/jruYp19DEAnwjQI9MRZTZxNQUBQWSIl2YO7w2Y5uOjneQEJ2Gu md2STzNPQUjoCU/on/y6nV2IWsQ/4MM6CukCQqh7wLnh0leJU+ctrudBbOBz77RymMD8 8TO3eGUlm/p1H3Ide+AR+7qRghZcyr0F7WXGd4WbqwGCBthJKE3w3617ZyXzUy9UoC0u kV0BjjExUfWoSmYvgVYJ8zgZfjEd+SNvKhfMvma0H8xzn+HpdN6YblCe+IDZas/WTtas 1s6Q== X-Forwarded-Encrypted: i=1; AJvYcCUKC2G19+SSFD86XvroDQC1RadLcT54kp/OUtMFMvSjZ3TbfDjND+BpWXcHv4VwkZVj9Be+CgnHVnEUcnLVgmdtCO4= X-Gm-Message-State: AOJu0Yye9m0HDuuNTtQ0uqre/RxAbROd4wYwfHJs0hEdPhu4fMnmGUhq 5hnVHtQnmAwa65fQE83QBjukBfSW1iUkKd2qBpB0rr5Qg3JBq+A6tknUy+EqGA== X-Google-Smtp-Source: AGHT+IGA4JGKwWWNLHCxq7izlVfvB2QGsE/36UJ5ZjuTNx2RCIULRNshQCd+NPhnH7MmJe3JVpwZYA== X-Received: by 2002:a05:6a20:12c5:b0:1a1:87b5:4b28 with SMTP id v5-20020a056a2012c500b001a187b54b28mr4995408pzg.0.1710356175280; Wed, 13 Mar 2024 11:56:15 -0700 (PDT) Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id z3-20020aa79903000000b006e6b959b636sm1615689pff.53.2024.03.13.11.56.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 11:56:14 -0700 (PDT) From: Kees Cook To: Eric Biederman Cc: Kees Cook , Shuah Khan , Mark Brown , Muhammad Usama Anjum , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] selftests/exec: execveat: Improve debug reporting Date: Wed, 13 Mar 2024 11:56:10 -0700 Message-Id: <20240313185606.work.073-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1980; i=keescook@chromium.org; h=from:subject:message-id; bh=SQS+ov8yIW6DEKRzVTZuSjdygsQnSqtlsD90R8giz/g=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBl8fbKt7Aicr2v1jL2D5Cbtq5T6AALRK5Ut0QjW yJY662adQiJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZfH2ygAKCRCJcvTf3G3A JhdZEACO826i+YbxlErFkdeBoatgCSeytNdOJhvq9RSnhz1h6CSrIOdrAzqhfHWtRFO1b/4Q4k/ bfZpBWeYDrreNjcB4+axQl0dBlBLpcvZD/XhhZWF/q2qXA8G4R8sL+IQgxvbC1SfY43m4voENz/ S11w3mMf4mhfsGrUCfSLJXUhkRSrw/uqmjZ2/158F5SiTU+x8c2QpqpXfd5nujAZQcLQefx3oji k68TQcM3f3oQeiAO0p011Bh9gHe92BSnjZB2Pfh3JJWeEOCOxR5/BEAQGF+Xwstsdc1gf5W2x47 maW249sTvbIujyJMudbFe6ADnOxYZzMxcNzsg8f7Xm67xyv/pUv3PMMisH/FC5a5xDuOcuM56NJ M7qkV5lAuGdGpFWQgrZ9vrPqSWsnE/fl0u44X6E9CTRaboDIU0if+uAm24IYm/e4HaXu5L31l+1 7OWMd0275j+zKuT5THdsQOMFsiP/Kl0jIChgbDt7IoViRJPOIsK2zLa6yzTrWCl85krYW/a2Gj5 YetE0h8hI10kXC8d/ynnF3syoaeTcRxOOd/CYVx6MfouycA3E5sMntsQGGqDvnxnQLh+ZoSDoaJ zqDad87A49h4QoM2nZYN1m5WfK4xlatrRK0ZHnPBwQYV8X7BzT8LEGyHaT6OCqDmfVsCdSPNfE3 cjjEus9 TFgxnctA== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 84BB31A0008 X-Rspam-User: X-Stat-Signature: d4hh7hdsnb8gcpxwjjtsi9harabq9xh6 X-Rspamd-Server: rspam01 X-HE-Tag: 1710356176-351207 X-HE-Meta: U2FsdGVkX19AxnNxHX7KsvxKSuCKl5BecoS7ohsUE6cZZ1R5cuCg+8AkzRELp2UBztvocXCwTCqYh10zS4g431SV/Uh//35hOmyiBL8yp7S8BOTeG5/WxqjEAMz/jj8M28qYi08cNtP+qh3yDKDyF0eph8XlLtYSraNTWNbW+zvA9l9C0l9WaE3FeW5rm5NClvr3Qzz03s3C7V59a0KAZIVJg6KzngkkxzCvfaTOEFnhQbeTPcxCm5dU7ssY7PuSR/cgu3vxCcyP95BaIkMd0am3PxwcAhkf722b5x6Kct6UCZ4GE+BVjLb3nFkjOd288FMTA9mRovHaMukdu9rV3DzfsnnYiSAtsCZLpPG8f990tfrIKgOieqBLlc+WmTaZfvAIGTioOWB2cXOk0qQoup0OnKGabvaqw7JkON6R10U2MkNI0yWkfNWgjwl0wU6HZzkmY44/Q71llWfH16PIwObDkAXOdUZPoE+xakff8ngN8TX8Ng9qwLydsR9QHvUd4hvIRznLqN53C3uPEe2F92YV7mJ4TW+BwjBrCsXBoJCQ0IqbKGB5K9syd+dntKif0gv9JA+EbweWa3xPhjG8fVwyIDWFqmcftYtCKgwsLOUzmgQX+oTQUudyXrZw6QJaG96jdxhq1FEKj2P9Q0RL+NhxYxrbDwgVSqvu9zOcU75aDs4QH9TXD/8KCl0LE0J7BmZTaCXdnDZvbv+eUMGkTqlnwb5w+85RWScQ/WGQfa4A+LUXmZIcxfptYGJu5iKopPqyUvuLDRgCxb5gA6oDYYfxUkR6DB16B8af0lA5qNu9eJ2WjIdHioQp/UlTtN3bbOFGQ8++TcV9Y/JQYTTC/HMBlwDVLvZHtc2crymVUS/bEMVFTYNc2FnX1zh0yGYPlkseOZDvJXktV2+N/sTAMRFAZxAQy2BwgvY+QHi5RCsg8cmqCr1Zf4G9K3s+sspAGFbrZHUicSqQ9kskbiD bh+1HqwI nyGewPloAcvpKPIzdhyFhwpadVxAUJI1Bnr9lmLEzmU4nNpoWeZIUKLxc8/irDdXGKHYlpkD6kcJZ8d8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Children processes were reporting their status, duplicating the parent's. Remove that, and add some additional details about the test execution. Signed-off-by: Kees Cook --- Cc: Eric Biederman Cc: Shuah Khan Cc: Mark Brown Cc: Muhammad Usama Anjum Cc: linux-mm@kvack.org Cc: linux-kselftest@vger.kernel.org --- tools/testing/selftests/exec/execveat.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/exec/execveat.c b/tools/testing/selftests/exec/execveat.c index 0546ca24f2b2..6418ded40bdd 100644 --- a/tools/testing/selftests/exec/execveat.c +++ b/tools/testing/selftests/exec/execveat.c @@ -98,10 +98,9 @@ static int check_execveat_invoked_rc(int fd, const char *path, int flags, if (child == 0) { /* Child: do execveat(). */ rc = execveat_(fd, path, argv, envp, flags); - ksft_print_msg("execveat() failed, rc=%d errno=%d (%s)\n", + ksft_print_msg("child execveat() failed, rc=%d errno=%d (%s)\n", rc, errno, strerror(errno)); - ksft_test_result_fail("%s\n", test_name); - exit(1); /* should not reach here */ + exit(errno); } /* Parent: wait for & check child's exit status. */ rc = waitpid(child, &status, 0); @@ -226,11 +225,14 @@ static int check_execveat_pathmax(int root_dfd, const char *src, int is_script) * "If the command name is found, but it is not an executable utility, * the exit status shall be 126."), so allow either. */ - if (is_script) + if (is_script) { + ksft_print_msg("Invoke script via root_dfd and relative filename\n"); fail += check_execveat_invoked_rc(root_dfd, longpath + 1, 0, 127, 126); - else + } else { + ksft_print_msg("Invoke exec via root_dfd and relative filename\n"); fail += check_execveat(root_dfd, longpath + 1, 0); + } return fail; } -- 2.34.1