From patchwork Wed Dec 19 21:33:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Stoppa X-Patchwork-Id: 10738173 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 622A56C5 for ; Wed, 19 Dec 2018 21:34:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5185C286B2 for ; Wed, 19 Dec 2018 21:34:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45F76286B4; Wed, 19 Dec 2018 21:34:34 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA498286B2 for ; Wed, 19 Dec 2018 21:34:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8C1EE8E001E; Wed, 19 Dec 2018 16:34:23 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 873638E001D; Wed, 19 Dec 2018 16:34:23 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EBCC8E001E; Wed, 19 Dec 2018 16:34:23 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) by kanga.kvack.org (Postfix) with ESMTP id F12378E001D for ; Wed, 19 Dec 2018 16:34:22 -0500 (EST) Received: by mail-lj1-f198.google.com with SMTP id j24-v6so5927773lji.20 for ; Wed, 19 Dec 2018 13:34:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:reply-to:mime-version :content-transfer-encoding; bh=wZ8trlwQPC9hiGZKEv5EaYDHKPPRSKQ7DlpYkIOznGo=; b=LJrTIm3Gkg3wwz6OvuQbJFDImRXzSWKHoRlk8VLdef0uqx1Mw9B/IR4Y/6MuZf755A RyLMH88nG56HEGmEbQ/Ab0sRjmaWlQ+zORZo+acmXT/avOD6ERFG/fnBsRjTkR0/2JLo 8F9gHQzVm0ARwTbVpsD02pD5zFFFeUB4+IZVX8rkBD+9I35KKLep8+2Biwk4lHelHTwC tR5HK3OZBbZVhL9kEhCYvQFbFIY8vqUGoCww55l7SKmpxJb1Yw/+BrYmNqvwUf6HGE3n 12f10g4bAoz0U2lL5+qVPeXAv3jkFfLDQdDFCvsfGVEE5/o1fqX0oUOKdA95aFix/doU zJxw== X-Gm-Message-State: AA+aEWbHVbloqn7XYa/mIiKNg4ueYLP/hSNSYaX+OOgEd1pr529PUO8K vVCJD/5LI0dsImGSPMs80NyqLRxAAVjVO7kvfNOXOajA7FTjrU33zzSAGcZI6ce1M3zPqxOM/N5 5F9Dbn7QSDv+0TynlWeNOlnap7CdwcfljnZFEk0V6hLFoj60Jwn00PtNvhw40fJVf0Kkj1P0w9L wQYSmkJVqFf7Mnru2Nukoz8+PAmHDkZmlPgWivqAADwP8vMdtEvX0Dmv+tei9RARKxlZ42ybI4g pyJ5zbojtabUvt5KQ7k/ykIM2Ui5OYPlSbwl7zJRKBCbrE/eJvz3yCm1BdTblFjAa06EL8zt0Tq 1f2/5l9I/TlIVcwQd+fyQ9xxnA5V2oduwCqJzAmHanD/pqLiF0pXi7bk7cjG3c56HsFh5DWavst E X-Received: by 2002:a19:c650:: with SMTP id w77mr14053398lff.56.1545255262418; Wed, 19 Dec 2018 13:34:22 -0800 (PST) X-Received: by 2002:a19:c650:: with SMTP id w77mr14053368lff.56.1545255261533; Wed, 19 Dec 2018 13:34:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545255261; cv=none; d=google.com; s=arc-20160816; b=xqUdtyW7NAT770LBB02OJsdmtD+Kq0YiNj/u/q+8omPYyc7msczT8JUJXeQX6Yic77 d2YQhjZA9vDQGBwJNk0bZqKaQSYcNB1sFj1QNcUWB/RIJirEOl6AdrzN7i+UJg6UF1Oo +e78Qu8ltfKgcBhqhh+c/dJBHsPzZkv5y1reYcSCWdIPDWHFCeyv0rJy7SzNooLCKs76 RKc4vBSvwCJsI9ffOZiWAOb/yCVyb8HvYLE2ItM/h7pCdmIm6ljYLWPX748xHAu/vegX LUfkg4REZja6z1nd3YLmghhHPvBcgA+tef4KYM8SAiNdCB2tVEfEUBFMhFveox4cQRgd nsCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=wZ8trlwQPC9hiGZKEv5EaYDHKPPRSKQ7DlpYkIOznGo=; b=GXXD9a6MVXjOIbRbytcGNk7Xf96YuEZjBODUtK0nMKCWT6zKLZh+4tRcGBirZH71Ww bCGAEFs4K9qEg1t+iA6gz4yRZVe44hghPTadMt8y2PzVAkNHMdFVX1fLHoGvPWsT7KmN 0kHGZC/EF1QZI01z6EMBHef7TSCQ0cjCTsL5LMsnVucN7Y50H19+qwTy48olczIyij2O C+CaYFn1w5UziTW3lJ3sdlNrq53hNhL+gkRhQ9VtT3IJZLAyBOy4vV8JBHYOsnbMjVC1 WQg9IdaBNZAgsRdZ+Tt3L40Zb0ORVVCLWeEAj87wzgI44VncGvrgFFg6h2mLvZLsW3x0 E58Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RU84YQAA; spf=pass (google.com: domain of igor.stoppa@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=igor.stoppa@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id w6sor5726775lfc.24.2018.12.19.13.34.21 for (Google Transport Security); Wed, 19 Dec 2018 13:34:21 -0800 (PST) Received-SPF: pass (google.com: domain of igor.stoppa@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RU84YQAA; spf=pass (google.com: domain of igor.stoppa@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=igor.stoppa@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com 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=wZ8trlwQPC9hiGZKEv5EaYDHKPPRSKQ7DlpYkIOznGo=; b=RU84YQAA9ttAmCj5fwbw1hMbyAy79lr8StEuIYPs9nOgSexZa0zqGJhbGusOBhYRhl xvmpaIiQVWKWaisVJxT3EF8AjHPFUOPsMmvVf0xabzznRPYkn4Ka2csi12L5kF0hjOA2 /YZ4p7KgF6klxJT/Fv9A5bUND4Lp9BrQt1C9Cu+DXoFZTNgZshlgaPpXxwkXJnqUg9BL qrMHZK/pasAsW4YC3x1UFogxA456adKKOJHz1U7syC70Xu0ShrNdgy0ATa0ffanp/ZPa 3YqZPYKxBhicupwqEWngQsDdCleZgY4sTjVKRTlNdvj6EHnv6HhLFbg4pQZAERHbxUTH llTg== X-Google-Smtp-Source: AFSGD/XdC5giLSZrQt/Kv87Ghx67drqER+B1qjvWKaiMHLOdw8yx48gU4/ChW9agrJeuwYmr+pkViQ== X-Received: by 2002:a19:8d01:: with SMTP id p1mr12727200lfd.149.1545255261117; Wed, 19 Dec 2018 13:34:21 -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.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 13:34:20 -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 09/12] rodata_test: add verification for __wr_after_init Date: Wed, 19 Dec 2018 23:33:35 +0200 Message-Id: <20181219213338.26619-10-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 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: X-Virus-Scanned: ClamAV using ClamSMTP The write protection of the __wr_after_init data can be verified with the same methodology used for const data. 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 | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/mm/rodata_test.c b/mm/rodata_test.c index e1349520b436..a669cf9f5a61 100644 --- a/mm/rodata_test.c +++ b/mm/rodata_test.c @@ -16,8 +16,23 @@ #define INIT_TEST_VAL 0xC3 +/* + * Note: __ro_after_init data is, for every practical effect, equivalent to + * const data, since they are even write protected at the same time; there + * is no need for separate testing. + * __wr_after_init data, otoh, is altered also after the write protection + * takes place and it cannot be exploitable for altering more permanent + * data. + */ + static const int rodata_test_data = INIT_TEST_VAL; +#ifdef CONFIG_PRMEM +static int wr_after_init_test_data __wr_after_init = INIT_TEST_VAL; +extern long __start_wr_after_init; +extern long __end_wr_after_init; +#endif + static bool test_data(char *data_type, const int *data, unsigned long start, unsigned long end) { @@ -59,7 +74,13 @@ static bool test_data(char *data_type, const int *data, void rodata_test(void) { - test_data("rodata", &rodata_test_data, - (unsigned long)&__start_rodata, - (unsigned long)&__end_rodata); + if (!test_data("rodata", &rodata_test_data, + (unsigned long)&__start_rodata, + (unsigned long)&__end_rodata)) + return; +#ifdef CONFIG_PRMEM + test_data("wr after init data", &wr_after_init_test_data, + (unsigned long)&__start_wr_after_init, + (unsigned long)&__end_wr_after_init); +#endif }