From patchwork Mon Aug 7 17:47:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13344667 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A42AFC001DB for ; Mon, 7 Aug 2023 17:48:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229953AbjHGRsB (ORCPT ); Mon, 7 Aug 2023 13:48:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229800AbjHGRsA (ORCPT ); Mon, 7 Aug 2023 13:48:00 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A5E410F4 for ; Mon, 7 Aug 2023 10:47:58 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-686fc0d3c92so3138640b3a.0 for ; Mon, 07 Aug 2023 10:47:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1691430478; x=1692035278; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=mKaYgqtMlR5WhIH4limsAacts/UKY08TjAm6rewYVlA=; b=kTQSF3JWaxS5JICxEvz7bD0rB1hlI5mHP8qd7Fwm014OWO7zqUZ0jW4wYKpAzan+Ho cAW3x+G80MggMAOf1sONO1CtJZfc1swqwwyupaN6+bbNSuWvP4pDfhasdIa9TeLqf2Vw F839vqrSspTdgGqkHM0mtWE+622uoq339MwOA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691430478; x=1692035278; 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=mKaYgqtMlR5WhIH4limsAacts/UKY08TjAm6rewYVlA=; b=gzNRFRTK5Zm1hLMgvSUvYwEEhoKwY3YiBYBBomKB3NE1s+UeR4hxOZwW1gCby28Plw 7NCaSOpND9DzVqZ5L1crn28z+C2m06xV68brl05CUIm/GyOpCo9JHkBaaeh8GtXxMRXp 3jJyOs9KSulqKWHFOE2k058fgj9pMMPTS2XgPoHPGJsrLbLP2QelsHOugnvKF1ETz5Rt SxH/90KO3cVCJheROUHxfZNsaXgVlFsvEwr2W17vNEAI2KJn8jhqREN1aaC/WHB21aUi Jxkq6e/GIGbw8f/ArVOuueuxT1d1cMPiXcrbCrOz4jzyTbF8O/EWoEe0ppTrn4MVrWo5 YFrQ== X-Gm-Message-State: AOJu0YwLVvM+wi2Sq6h2gk8WK1+1DV9mjxoqKvOgHjDz1TL6TJU/59G3 l2xgDd5i5Dvj/30RegLUtDjL6g== X-Google-Smtp-Source: AGHT+IGKe+itZrIImyHKZJ+9kSic6E9IGaC+DVjhSX9EPCD2Jdh0qErbvyUazBTFVXAdvIjXr2mZHg== X-Received: by 2002:a05:6a20:4422:b0:132:c07d:9dd2 with SMTP id ce34-20020a056a20442200b00132c07d9dd2mr9943521pzb.39.1691430477919; Mon, 07 Aug 2023 10:47:57 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id j21-20020a62b615000000b00687375d9135sm6395995pff.4.2023.08.07.10.47.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 10:47:57 -0700 (PDT) From: Kees Cook To: Shuah Khan Cc: Kees Cook , Andy Lutomirski , Will Drewry , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] selftests/harness: Actually report SKIP for signal tests Date: Mon, 7 Aug 2023 10:47:53 -0700 Message-Id: <20230807174753.never.547-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1551; i=keescook@chromium.org; h=from:subject:message-id; bh=RAxZQEsMi71+QLOVGZip55OnqX1tTd8XqrLZIxyuuK4=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBk0S5JsDfPeKejilUk34p9D4hES6BA/MtQCWhck tdHBteX7nSJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZNEuSQAKCRCJcvTf3G3A Ji2/EACo+FuJ7wPfDSuota88CJ/wsp0G8PkCjRaS0EdNDMjuF8oiJeNilpQeImfWF7Y5L6/VGgd 8W/AN3UP0AE8FS71zpk+DU5oBQI4S0f+5G472EgHq+fP84OQrJAiD9Qt2sZRjrfMPM1aY6IU46K f1IWLmsLvkSFyv3ELK4fEqmZDjJQ+5vdxhuwKQpaC6BtXuv5nLBAIJ8IgNX9eyQborjsPciQ/cS SRveKXrKeIqI23BqowPDh0shxJHeyShgiD6muEl+WR5fthDxE+qjzNmv4+HC4+fgVqtHwwrkFZx KQa9pXduZPydPa51qkRQw3FPcVa8bNA8Q53svOblFhyXsMy2gzzT38L/9qQqlbDoSDDjUn5frm2 mMZb1jig3QgC6Dnz3JOzpN7hEzDF+Ts6Bo7AI9Cvq8oMu9XdcjqwNeiT7WMJgIElgGCyI3ZhEER 2eTthAjVFRJJOvpDmicQO+MKrB3SjVN68+tUafGnArrrG2fpcNjQujSvujX/2CJ3NuDq3PVdz4S NdqcBF4SkmSvGvfNyUqN2ySoIpRw3E5DAV4oDzKfoeCigJxS8icJnDZK0zWWfXo+jaOVDbFhD10 8kINaTZWRkTE5S/RsY18RTtPdXW69oQYBCvpxfuYb3DdUPuiIfapCCc2D/bZcOqCuIImMAzMUYk 1YYiBfP ATZMAOyg== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org Tests that were expecting a signal were not correctly checking for a SKIP condition. Move the check before the signal checking when processing test result. Cc: Shuah Khan Cc: Andy Lutomirski Cc: Will Drewry Cc: linux-kselftest@vger.kernel.org Fixes: 9847d24af95c ("selftests/harness: Refactor XFAIL into SKIP") Signed-off-by: Kees Cook --- tools/testing/selftests/kselftest_harness.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index 5fd49ad0c696..e05ac8261046 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -938,7 +938,11 @@ void __wait_for_test(struct __test_metadata *t) fprintf(TH_LOG_STREAM, "# %s: Test terminated by timeout\n", t->name); } else if (WIFEXITED(status)) { - if (t->termsig != -1) { + if (WEXITSTATUS(status) == 255) { + /* SKIP */ + t->passed = 1; + t->skip = 1; + } else if (t->termsig != -1) { t->passed = 0; fprintf(TH_LOG_STREAM, "# %s: Test exited normally instead of by signal (code: %d)\n", @@ -950,11 +954,6 @@ void __wait_for_test(struct __test_metadata *t) case 0: t->passed = 1; break; - /* SKIP */ - case 255: - t->passed = 1; - t->skip = 1; - break; /* Other failure, assume step report. */ default: t->passed = 0;