From patchwork Wed Dec 19 21:33:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Stoppa X-Patchwork-Id: 10738191 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DCD8814E5 for ; Wed, 19 Dec 2018 21:35:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC866286B2 for ; Wed, 19 Dec 2018 21:35:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCBE6286B4; Wed, 19 Dec 2018 21:35:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58AEA286B2 for ; Wed, 19 Dec 2018 21:35:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730745AbeLSVeW (ORCPT ); Wed, 19 Dec 2018 16:34:22 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:40128 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730712AbeLSVeW (ORCPT ); Wed, 19 Dec 2018 16:34:22 -0500 Received: by mail-lf1-f67.google.com with SMTP id v5so16172521lfe.7; Wed, 19 Dec 2018 13:34:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=SjAzFSoIbClc3Yu72aaENnK9IwoMj4eRGCahSXkkXDY=; b=poGcWw/a5dJN1e4IsKUTg9pMbxoGjkckyx8MaSkIr8aVIRng3tIcIrdZ7bIpwBd1aW /Dj6i5fqZOC7b6xeP5q+VcNLiipYZbnUbSanuScQx6ZaQW9f5b2Xc5P/F/qzTZVierGT Rd6CLxydzbm7Mo5/8Hgsx4sm9C32VGSlCBeCSB9A/b18FgE2P5go+U/9Ibz9AFsHQ4YE avQ097RseD5F7PI14K0mNcIC26Xs55WgqRCaGNpums6/2CHHlkW/alMX3lufYGhYovJp I/Fnbo+3KnK1CiTtnCbj4tjLXBQ9xQMrqk97gx2+rBN1d9247ZwYsu/LSWuWqhwEXB+p azjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=SjAzFSoIbClc3Yu72aaENnK9IwoMj4eRGCahSXkkXDY=; b=eoYd1IqME4ddsmSF786otwxYL081kzobZqIXX2p39X7tx9QhC+aMIibu5/6dhAwVft wr3/kP3qEOGoq3GKnuUe5P+upFtgqfTIhs0BPxFDuPAuGxPfoGXlU/M1LENNhsTCWFz6 ophhAOpeFXi58YI5CEBPbsjtCk9K0iCnRj8UpAtBjPh7GeiabXfWxNCx19iR8rONr8pX k3ASXsmn93tQOvxphOIWrdwHWshVEpPI2eEZ8XcGcoYNlomh7iicLcZZWtPpa+oaAhYO dSzTmqwDmVyJC7wmE4Fu17HlsGY0eDHm7FKetQabJnG/dh2PghDuNYHS1skCV22b90+H zkAg== X-Gm-Message-State: AA+aEWZ78wSxiBPPUTD4iFvkC7XJ1yZ5rfeBAwrModhiZfqBWWFAtWf/ DeeQNqMZCQ5Ix6sM52Cj1fU= X-Google-Smtp-Source: AFSGD/XS2Kzx9OR3BTlvyctmNLbS6bmvi/yoWDfNmmdJC+n2aSmi3aLbOa8u5dUsvtPjgDv0jk8AaA== X-Received: by 2002:a19:5402:: with SMTP id i2mr13050911lfb.128.1545255259391; Wed, 19 Dec 2018 13:34:19 -0800 (PST) Received: from localhost.localdomain (dmhwpt3bffxn8z3-j6k-4.rev.dnainternet.fi. [2001:14bb:51:a4c8:5c24:24d7:ca5f:e7d2]) by smtp.gmail.com with ESMTPSA id v64sm3996867lfa.48.2018.12.19.13.34.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 13:34:18 -0800 (PST) From: Igor Stoppa X-Google-Original-From: Igor Stoppa To: Andy Lutomirski , Matthew Wilcox , Peter Zijlstra , Dave Hansen , Mimi Zohar Cc: igor.stoppa@huawei.com, Nadav Amit , Kees Cook , linux-integrity@vger.kernel.org, kernel-hardening@lists.openwall.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/12] rodata_test: refactor tests Date: Wed, 19 Dec 2018 23:33:34 +0200 Message-Id: <20181219213338.26619-9-igor.stoppa@huawei.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181219213338.26619-1-igor.stoppa@huawei.com> References: <20181219213338.26619-1-igor.stoppa@huawei.com> Reply-To: Igor Stoppa MIME-Version: 1.0 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Refactor the test cases, in preparation for using them also for testing __wr_after_init memory, when available. Signed-off-by: Igor Stoppa CC: Andy Lutomirski CC: Nadav Amit CC: Matthew Wilcox CC: Peter Zijlstra CC: Kees Cook CC: Dave Hansen CC: Mimi Zohar CC: linux-integrity@vger.kernel.org CC: kernel-hardening@lists.openwall.com CC: linux-mm@kvack.org CC: linux-kernel@vger.kernel.org --- mm/rodata_test.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/mm/rodata_test.c b/mm/rodata_test.c index d908c8769b48..e1349520b436 100644 --- a/mm/rodata_test.c +++ b/mm/rodata_test.c @@ -14,44 +14,52 @@ #include #include -static const int rodata_test_data = 0xC3; +#define INIT_TEST_VAL 0xC3 -void rodata_test(void) +static const int rodata_test_data = INIT_TEST_VAL; + +static bool test_data(char *data_type, const int *data, + unsigned long start, unsigned long end) { - unsigned long start, end; int zero = 0; /* test 1: read the value */ /* If this test fails, some previous testrun has clobbered the state */ - if (!rodata_test_data) { - pr_err("test 1 fails (start data)\n"); - return; + if (*data != INIT_TEST_VAL) { + pr_err("%s: test 1 fails (init data value)\n", data_type); + return false; } /* test 2: write to the variable; this should fault */ - if (!probe_kernel_write((void *)&rodata_test_data, - (void *)&zero, sizeof(zero))) { - pr_err("test data was not read only\n"); - return; + if (!probe_kernel_write((void *)data, (void *)&zero, sizeof(zero))) { + pr_err("%s: test data was not read only\n", data_type); + return false; } /* test 3: check the value hasn't changed */ - if (rodata_test_data == zero) { - pr_err("test data was changed\n"); - return; + if (*data != INIT_TEST_VAL) { + pr_err("%s: test data was changed\n", data_type); + return false; } /* test 4: check if the rodata section is PAGE_SIZE aligned */ - start = (unsigned long)__start_rodata; - end = (unsigned long)__end_rodata; if (start & (PAGE_SIZE - 1)) { - pr_err("start of .rodata is not page size aligned\n"); - return; + pr_err("%s: start of data is not page size aligned\n", + data_type); + return false; } if (end & (PAGE_SIZE - 1)) { - pr_err("end of .rodata is not page size aligned\n"); - return; + pr_err("%s: end of data is not page size aligned\n", + data_type); + return false; } + pr_info("%s tests were successful", data_type); + return true; +} - pr_info("all tests were successful\n"); +void rodata_test(void) +{ + test_data("rodata", &rodata_test_data, + (unsigned long)&__start_rodata, + (unsigned long)&__end_rodata); }