From patchwork Thu Feb 17 20:56:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 12750639 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 D4D8BC433F5 for ; Thu, 17 Feb 2022 20:57:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231787AbiBQU5T (ORCPT ); Thu, 17 Feb 2022 15:57:19 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:43848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243654AbiBQU5T (ORCPT ); Thu, 17 Feb 2022 15:57:19 -0500 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EB90245AC; Thu, 17 Feb 2022 12:57:04 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: usama.anjum) with ESMTPSA id A09521F46304 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1645131422; bh=HVDGGUKsKqIe9BO+dcKa/W+YmBbvLNbYJGuS3cf5tY8=; h=From:To:Cc:Subject:Date:From; b=D05Qs7dtvxBGd6jZ4EUAfV+5DDT9S6mxthr1WgUlgMtsy8y0zZkHIenNjD1PZUz/I o53M+dy2+8RPxyGzEVWLlw7TNqkzJQ3ga+BGBCaawcRS7aQWnGxQOBcZZ+ugch1+LH o5xWcOnleTOfI0cceVFLQMidx8J4sEK/35bUy4UwpgM1ZNomsEAQUZhrQWjCU3AZWJ 6zG+Ld2UFjTXz+Id47FeMA0gXS4Ok4r7CPVSUkSCdkzqWOOk4SOwPbuIGLPxbIYOsm ToDrfXeW7QQ8722EjJkCtzeud2MAhBSTDwTCjYBuI8s00W10sXaCiLZal4FAxoSthY 5sPalScD/YjVA== From: Muhammad Usama Anjum To: Kees Cook , Shuah Khan Cc: Muhammad Usama Anjum , kernel@collabora.com, kernelci@groups.io, Greg Kroah-Hartman , Shuah Khan , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] selftests/lkdtm: add config and turn off CFI_FORWARD_PROTO Date: Fri, 18 Feb 2022 01:56:19 +0500 Message-Id: <20220217205620.2512094-1-usama.anjum@collabora.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add config options which are needed for LKDTM sub-tests. STACKLEAK_ERASING test needs GCC_PLUGIN_STACKLEAK config. READ_AFTER_FREE and READ_BUDDY_AFTER_FREE tests need INIT_ON_FREE_DEFAULT_ON config. CFI_FORWARD_PROTO always fails as there is no active CFI system of some kind. Turn it off for now by default until proper support. Cc: Kees Cook Cc: Greg Kroah-Hartman Fixes: 46d1a0f03d66 ("selftests/lkdtm: Add tests for LKDTM targets") Signed-off-by: Muhammad Usama Anjum Reported-by: "kernelci.org bot" --- tools/testing/selftests/lkdtm/config | 2 ++ tools/testing/selftests/lkdtm/tests.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/lkdtm/config b/tools/testing/selftests/lkdtm/config index 46f39ee762086..adc9fa60057c5 100644 --- a/tools/testing/selftests/lkdtm/config +++ b/tools/testing/selftests/lkdtm/config @@ -2,8 +2,10 @@ CONFIG_LKDTM=y CONFIG_DEBUG_LIST=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_FORTIFY_SOURCE=y +CONFIG_GCC_PLUGIN_STACKLEAK=y CONFIG_HARDENED_USERCOPY=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y +CONFIG_INIT_ON_FREE_DEFAULT_ON=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_UBSAN=y CONFIG_UBSAN_BOUNDS=y diff --git a/tools/testing/selftests/lkdtm/tests.txt b/tools/testing/selftests/lkdtm/tests.txt index 6b36b7f5dcf96..aa947b0ce1eeb 100644 --- a/tools/testing/selftests/lkdtm/tests.txt +++ b/tools/testing/selftests/lkdtm/tests.txt @@ -72,7 +72,7 @@ USERCOPY_STACK_FRAME_FROM USERCOPY_STACK_BEYOND USERCOPY_KERNEL STACKLEAK_ERASING OK: the rest of the thread stack is properly erased -CFI_FORWARD_PROTO +#CFI_FORWARD_PROTO FORTIFIED_STRSCPY FORTIFIED_OBJECT FORTIFIED_SUBOBJECT From patchwork Thu Feb 17 20:56:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 12750640 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 A3EFAC433EF for ; Thu, 17 Feb 2022 20:57:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243698AbiBQU5W (ORCPT ); Thu, 17 Feb 2022 15:57:22 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:44090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243654AbiBQU5V (ORCPT ); Thu, 17 Feb 2022 15:57:21 -0500 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9C3B26570; Thu, 17 Feb 2022 12:57:06 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: usama.anjum) with ESMTPSA id 919661F46309 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1645131425; bh=o3K6tBzoDd9/wUzrBeJx9N/1UIvuvmQGWXMam7COp4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kcl7N0jJOd6xombjhHEZtPPOy7HfPXscpWoPieyMDbxjizt6W/7vKMMsZIWciKKbc ujcVO6Ldu2dnrJUdd/RRnzDT6qRaUvnNSUvlUnfZ3DCJVR0EXZVM888asx0ZhMcLs7 vHA0oLYhgaBpXyuH1RnGxjot+M7CbFpyJQhmk0/+faOgy7yM7E55aLfYaTa7ucyY7N 9xbiyYA9tSQ9ER4o752nSVTkxZDW1WngjorJ9dCRNhNMq5jsq349BV2wYKp3xmNr0/ W1N+MCPMb8lyRxKtWxh7nyfGwxiiiFvVS1eRRDQwk3h7z8i+e+28yd2JlwniVSZcLN qM85pAYXXo1ZQ== From: Muhammad Usama Anjum To: Kees Cook , Shuah Khan , Greg Kroah-Hartman Cc: Muhammad Usama Anjum , kernel@collabora.com, kernelci@groups.io, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] selftests/lkdtm: add config Date: Fri, 18 Feb 2022 01:56:20 +0500 Message-Id: <20220217205620.2512094-2-usama.anjum@collabora.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220217205620.2512094-1-usama.anjum@collabora.com> References: <20220217205620.2512094-1-usama.anjum@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add config option which is needed for SLAB_LINEAR_OVERFLOW test. It needs KASAN enabled. Cc: Kees Cook Cc: Greg Kroah-Hartman Fixes: 9c4f6ebc3665 ("lkdtm/heap: Add vmalloc linear overflow test") Signed-off-by: Muhammad Usama Anjum Reported-by: "kernelci.org bot" --- tools/testing/selftests/lkdtm/config | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/lkdtm/config b/tools/testing/selftests/lkdtm/config index adc9fa60057c5..4e8af0f712f74 100644 --- a/tools/testing/selftests/lkdtm/config +++ b/tools/testing/selftests/lkdtm/config @@ -7,6 +7,7 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_INIT_ON_FREE_DEFAULT_ON=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y +CONFIG_KASAN=y CONFIG_UBSAN=y CONFIG_UBSAN_BOUNDS=y CONFIG_UBSAN_TRAP=y