From patchwork Fri Apr 13 13:41:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Stoppa X-Patchwork-Id: 10340115 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 91F236039A for ; Fri, 13 Apr 2018 13:44:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8CD4128857 for ; Fri, 13 Apr 2018 13:44:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 819AC28858; Fri, 13 Apr 2018 13:44:11 +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=-5.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id B10382884A for ; Fri, 13 Apr 2018 13:44:10 +0000 (UTC) Received: (qmail 31782 invoked by uid 550); 13 Apr 2018 13:43:30 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 30680 invoked from network); 13 Apr 2018 13:43:26 -0000 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; bh=07XywjeaHFrDXVbl8LnLF2bNdgKv2lnLYdnvTw1+COw=; b=BP9R5XlFVy/eMi/KgOUgjyslfxI0k7Wm8J8CLVx/ojlsJFyTRS3aqSrkPi3qFBjrYu V5cRTFnb+cbDVSY9RkJC7dbXolEL+A/EHqOCdsd/ju2yf6SVXusOUuS3p43KcQtksoDv daOZ7gGBEtOI/jhDc2tJ7XQflbpCCjtWjWcFx5a0Zd4MpeigxbeLaz1ehC1Tk/XobxSS cygnVZMyqdxYPj6zNPprQga2V/IYVFseKJ8T4VJyh82BFrr/O3fVp4J2L+aMdK9/UtVQ OeNRrj/atpf9X7K+IRZDS81fcebe1C/A5s6vKcAqo1mMluygUfrCI6D587wi+iFBvhh0 muog== 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; bh=07XywjeaHFrDXVbl8LnLF2bNdgKv2lnLYdnvTw1+COw=; b=q63VH/oR7TyeW/OumSwAbJ86xSeDNHfRkFxKEHDZt4NNGLL43QAptyBICd6kehjBgu pKU9G/tcy1FPIoZ9Zq16uJXdCqmmtwCmOI3ifYSmfFD8nzR7sw9iU87l+Ob/iHqvLEOY hx8jUAMMSD4rsvJKCfog/ezJ1vZhN88fiUDHnkiGheyju+BPTJ0YvzLW+vEBEDNaM/Wy guPp1O3IbIoXratpTMKlZqkZHLhPtOWmYM/IJRWWYKqONOlrogvJqIE3Hu0CtQrPK6/H UbFz/qiBee29yJAeuVsUE+ORto4bo2HR7OTBASdzI8FyI9fOTZzgUApYIuaarwaU7zma 91Lw== X-Gm-Message-State: ALQs6tCoV8WUaTLSPRL5lJrcVcs6JpkgN6Dnb1HCoyWXrROVFjp9jhKy zW2MzgEJJhU1UIpTZnmU2Sk= X-Google-Smtp-Source: AIpwx48fI1fv+Py8LK0y8MOS8bvAdk18l1HMDR/w9DS4aV84l3q0R4D/iEK/STsvHj1KkcMuXAh5Vw== X-Received: by 2002:a19:23c5:: with SMTP id j188-v6mr7968178lfj.122.1523626995461; Fri, 13 Apr 2018 06:43:15 -0700 (PDT) From: Igor Stoppa X-Google-Original-From: Igor Stoppa To: willy@infradead.org, keescook@chromium.org, mhocko@kernel.org, corbet@lwn.net Cc: david@fromorbit.com, rppt@linux.vnet.ibm.com, labbott@redhat.com, linux-security-module@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com, Igor Stoppa Subject: [PATCH 6/6] lkdtm: crash on overwriting protected pmalloc var Date: Fri, 13 Apr 2018 17:41:31 +0400 Message-Id: <20180413134131.4651-7-igor.stoppa@huawei.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180413134131.4651-1-igor.stoppa@huawei.com> References: <20180413134131.4651-1-igor.stoppa@huawei.com> X-Virus-Scanned: ClamAV using ClamSMTP Verify that pmalloc read-only protection is in place: trying to overwrite a protected variable will crash the kernel. Signed-off-by: Igor Stoppa --- drivers/misc/lkdtm/core.c | 3 +++ drivers/misc/lkdtm/lkdtm.h | 1 + drivers/misc/lkdtm/perms.c | 25 +++++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/drivers/misc/lkdtm/core.c b/drivers/misc/lkdtm/core.c index 2154d1bfd18b..c9fd42bda6ee 100644 --- a/drivers/misc/lkdtm/core.c +++ b/drivers/misc/lkdtm/core.c @@ -155,6 +155,9 @@ static const struct crashtype crashtypes[] = { CRASHTYPE(ACCESS_USERSPACE), CRASHTYPE(WRITE_RO), CRASHTYPE(WRITE_RO_AFTER_INIT), +#ifdef CONFIG_PROTECTABLE_MEMORY + CRASHTYPE(WRITE_RO_PMALLOC), +#endif CRASHTYPE(WRITE_KERN), CRASHTYPE(REFCOUNT_INC_OVERFLOW), CRASHTYPE(REFCOUNT_ADD_OVERFLOW), diff --git a/drivers/misc/lkdtm/lkdtm.h b/drivers/misc/lkdtm/lkdtm.h index 9e513dcfd809..dcda3ae76ceb 100644 --- a/drivers/misc/lkdtm/lkdtm.h +++ b/drivers/misc/lkdtm/lkdtm.h @@ -38,6 +38,7 @@ void lkdtm_READ_BUDDY_AFTER_FREE(void); void __init lkdtm_perms_init(void); void lkdtm_WRITE_RO(void); void lkdtm_WRITE_RO_AFTER_INIT(void); +void lkdtm_WRITE_RO_PMALLOC(void); void lkdtm_WRITE_KERN(void); void lkdtm_EXEC_DATA(void); void lkdtm_EXEC_STACK(void); diff --git a/drivers/misc/lkdtm/perms.c b/drivers/misc/lkdtm/perms.c index 53b85c9d16b8..4660ff0bfa44 100644 --- a/drivers/misc/lkdtm/perms.c +++ b/drivers/misc/lkdtm/perms.c @@ -9,6 +9,7 @@ #include #include #include +#include #include /* Whether or not to fill the target memory area with do_nothing(). */ @@ -104,6 +105,30 @@ void lkdtm_WRITE_RO_AFTER_INIT(void) *ptr ^= 0xabcd1234; } +#ifdef CONFIG_PROTECTABLE_MEMORY +void lkdtm_WRITE_RO_PMALLOC(void) +{ + struct pmalloc_pool *pool; + int *i; + + pool = pmalloc_create_pool(); + if (WARN(!pool, "Failed preparing pool for pmalloc test.")) + return; + + i = (int *)pmalloc(pool, sizeof(int)); + if (WARN(!i, "Failed allocating memory for pmalloc test.")) { + pmalloc_destroy_pool(pool); + return; + } + + *i = INT_MAX; + pmalloc_protect_pool(pool); + + pr_info("attempting bad pmalloc write at %p\n", i); + *i = 0; +} +#endif + void lkdtm_WRITE_KERN(void) { size_t size;