From: J Freyensee <why2jjj.linux@gmail.com>
To: Igor Stoppa <igor.stoppa@huawei.com>,
david@fromorbit.com, willy@infradead.org, keescook@chromium.org,
mhocko@kernel.org
Cc: labbott@redhat.com, linux-security-module@vger.kernel.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
kernel-hardening@lists.openwall.com
Subject: Re: [PATCH 6/7] lkdtm: crash on overwriting protected pmalloc var
Date: Tue, 6 Mar 2018 09:20:04 -0800 [thread overview]
Message-ID: <1723ee8d-c89e-0704-c2c3-254eda39dc8b@gmail.com> (raw)
In-Reply-To: <20180228200620.30026-7-igor.stoppa@huawei.com>
On 2/28/18 12:06 PM, Igor Stoppa wrote:
> Verify that pmalloc read-only protection is in place: trying to
> overwrite a protected variable will crash the kernel.
>
> Signed-off-by: Igor Stoppa <igor.stoppa@huawei.com>
> ---
> drivers/misc/lkdtm.h | 1 +
> drivers/misc/lkdtm_core.c | 3 +++
> drivers/misc/lkdtm_perms.c | 28 ++++++++++++++++++++++++++++
> 3 files changed, 32 insertions(+)
>
> diff --git a/drivers/misc/lkdtm.h b/drivers/misc/lkdtm.h
> index 9e513dcfd809..dcda3ae76ceb 100644
> --- a/drivers/misc/lkdtm.h
> +++ b/drivers/misc/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);
Does this need some sort of #ifdef too?
> void lkdtm_WRITE_KERN(void);
> void lkdtm_EXEC_DATA(void);
> void lkdtm_EXEC_STACK(void);
> 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_perms.c b/drivers/misc/lkdtm_perms.c
> index 53b85c9d16b8..0ac9023fd2b0 100644
> --- a/drivers/misc/lkdtm_perms.c
> +++ b/drivers/misc/lkdtm_perms.c
> @@ -9,6 +9,7 @@
> #include <linux/vmalloc.h>
> #include <linux/mman.h>
> #include <linux/uaccess.h>
> +#include <linux/pmalloc.h>
> #include <asm/cacheflush.h>
>
> /* Whether or not to fill the target memory area with do_nothing(). */
> @@ -104,6 +105,33 @@ void lkdtm_WRITE_RO_AFTER_INIT(void)
> *ptr ^= 0xabcd1234;
> }
>
> +#ifdef CONFIG_PROTECTABLE_MEMORY
> +void lkdtm_WRITE_RO_PMALLOC(void)
> +{
> + struct gen_pool *pool;
> + int *i;
> +
> + pool = pmalloc_create_pool("pool", 0);
> + if (unlikely(!pool)) {
> + pr_info("Failed preparing pool for pmalloc test.");
> + return;
> + }
> +
> + i = (int *)pmalloc(pool, sizeof(int), GFP_KERNEL);
> + if (unlikely(!i)) {
> + pr_info("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;
OK, now I'm on the right version of this patch series, same comment
applies. I don't get the local *i assignment at the end of the
function, but seems harmless.
Except the two minor comments, otherwise,
Reviewed-by: Jay Freyensee <why2jjj.linux@gmail.com>
> +}
> +#endif
> +
> void lkdtm_WRITE_KERN(void)
> {
> size_t size;
next prev parent reply other threads:[~2018-03-06 17:20 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-28 20:06 [RFC PATCH v18 0/7] mm: security: ro protection for dynamic data Igor Stoppa
2018-02-28 20:06 ` [PATCH 1/7] genalloc: track beginning of allocations Igor Stoppa
2018-03-02 16:37 ` kbuild test robot
2018-03-02 16:47 ` kbuild test robot
2018-03-05 19:00 ` J Freyensee
2018-03-06 17:39 ` Igor Stoppa
2018-03-06 13:19 ` Mike Rapoport
2018-03-06 14:13 ` Matthew Wilcox
2018-03-07 14:48 ` Igor Stoppa
2018-03-07 15:46 ` Igor Stoppa
2018-03-07 17:44 ` Mike Rapoprt
2018-03-06 14:10 ` Matthew Wilcox
2018-03-06 16:05 ` Igor Stoppa
2018-03-07 10:51 ` Igor Stoppa
2018-02-28 20:06 ` [PATCH 2/7] genalloc: selftest Igor Stoppa
2018-03-05 19:37 ` J Freyensee
2018-02-28 20:06 ` [PATCH 3/7] struct page: add field for vm_struct Igor Stoppa
2018-03-03 2:35 ` kbuild test robot
2018-03-05 20:31 ` J Freyensee
2018-02-28 20:06 ` [PATCH 4/7] Protectable Memory Igor Stoppa
2018-03-06 3:59 ` J Freyensee
2018-03-07 14:07 ` Igor Stoppa
2018-03-12 19:13 ` Matthew Wilcox
2018-03-12 21:25 ` Igor Stoppa
2018-02-28 20:06 ` [PATCH 5/7] Pmalloc selftest Igor Stoppa
2018-03-03 6:59 ` kbuild test robot
2018-03-06 17:13 ` J Freyensee
2018-02-28 20:06 ` [PATCH 6/7] lkdtm: crash on overwriting protected pmalloc var Igor Stoppa
2018-03-06 17:20 ` J Freyensee [this message]
2018-03-07 13:18 ` Igor Stoppa
2018-03-07 17:26 ` J Freyensee
2018-02-28 20:06 ` [PATCH 7/7] Documentation for Pmalloc Igor Stoppa
2018-03-06 13:30 ` Mike Rapoport
2018-03-06 17:33 ` J Freyensee
-- strict thread matches above, loose matches on Subject: below --
2018-02-23 14:48 [RFC PATCH v17 0/7] mm: security: ro protection for dynamic data Igor Stoppa
2018-02-23 14:48 ` [PATCH 6/7] lkdtm: crash on overwriting protected pmalloc var Igor Stoppa
2018-02-25 3:46 ` kbuild test robot
2018-03-06 17:05 ` J Freyensee
2018-03-06 17:08 ` J Freyensee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1723ee8d-c89e-0704-c2c3-254eda39dc8b@gmail.com \
--to=why2jjj.linux@gmail.com \
--cc=david@fromorbit.com \
--cc=igor.stoppa@huawei.com \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=labbott@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mhocko@kernel.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).