From: AKASHI Takahiro <takahiro.akashi@linaro.org>
To: kernel-hardening@lists.openwall.com
Cc: keescook@chromium.org, Hans Liljestrand <ishkamiel@gmail.com>,
Elena Reshetova <elena.reshetova@intel.com>,
David Windsor <dwindsor@gmail.com>
Subject: Re: [kernel-hardening] [RFC v2 PATCH 13/13] lkdtm: add tests for atomic over-/underflow
Date: Tue, 25 Oct 2016 17:56:56 +0900 [thread overview]
Message-ID: <20161025085655.GW19531@linaro.org> (raw)
In-Reply-To: <1476959131-6153-14-git-send-email-elena.reshetova@intel.com>
On Thu, Oct 20, 2016 at 01:25:31PM +0300, Elena Reshetova wrote:
> From: Hans Liljestrand <ishkamiel@gmail.com>
>
> This adds additional tests for modified atomic functions.
>
> Signed-off-by: Hans Liljestrand <ishkamiel@gmail.com>
> Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
> Signed-off-by: David Windsor <dwindsor@gmail.com>
> ---
> drivers/misc/lkdtm.h | 17 +++++++
> drivers/misc/lkdtm_bugs.c | 122 +++++++++++++++++++++++++++++++++++++++-------
> drivers/misc/lkdtm_core.c | 17 +++++++
> 3 files changed, 138 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/misc/lkdtm.h b/drivers/misc/lkdtm.h
> index cfa1039..224713a 100644
> --- a/drivers/misc/lkdtm.h
> +++ b/drivers/misc/lkdtm.h
> @@ -20,7 +20,24 @@ void lkdtm_HARDLOCKUP(void);
> void lkdtm_SPINLOCKUP(void);
> void lkdtm_HUNG_TASK(void);
> void lkdtm_ATOMIC_UNDERFLOW(void);
> +void lkdtm_ATOMIC_DEC_RETURN_UNDERFLOW(void);
> +void lkdtm_ATOMIC_SUB_UNDERFLOW(void);
> +void lkdtm_ATOMIC_SUB_RETURN_UNDERFLOW(void);
> void lkdtm_ATOMIC_OVERFLOW(void);
> +void lkdtm_ATOMIC_INC_RETURN_OVERFLOW(void);
> +void lkdtm_ATOMIC_ADD_OVERFLOW(void);
> +void lkdtm_ATOMIC_ADD_RETURN_OVERFLOW(void);
> +void lkdtm_ATOMIC_ADD_UNLESS_OVERFLOW(void);
> +void lkdtm_ATOMIC_INC_AND_TEST_OVERFLOW(void);
> +void lkdtm_ATOMIC_LONG_UNDERFLOW(void);
> +void lkdtm_ATOMIC_LONG_DEC_RETURN_UNDERFLOW(void);
> +void lkdtm_ATOMIC_LONG_SUB_UNDERFLOW(void);
> +void lkdtm_ATOMIC_LONG_SUB_RETURN_UNDERFLOW(void);
> +void lkdtm_ATOMIC_LONG_OVERFLOW(void);
> +void lkdtm_ATOMIC_LONG_INC_RETURN_OVERFLOW(void);
> +void lkdtm_ATOMIC_LONG_ADD_OVERFLOW(void);
> +void lkdtm_ATOMIC_LONG_ADD_RETURN_OVERFLOW(void);
> +void lkdtm_ATOMIC_LONG_SUB_AND_TEST(void);
> void lkdtm_CORRUPT_LIST_ADD(void);
> void lkdtm_CORRUPT_LIST_DEL(void);
>
> diff --git a/drivers/misc/lkdtm_bugs.c b/drivers/misc/lkdtm_bugs.c
> index f336206..bd79a88 100644
> --- a/drivers/misc/lkdtm_bugs.c
> +++ b/drivers/misc/lkdtm_bugs.c
> @@ -128,30 +128,116 @@ void lkdtm_HUNG_TASK(void)
> schedule();
> }
>
> -void lkdtm_ATOMIC_UNDERFLOW(void)
> -{
> - atomic_t under = ATOMIC_INIT(INT_MIN);
> -
> - pr_info("attempting good atomic increment\n");
> - atomic_inc(&under);
> - atomic_dec(&under);
> -
> - pr_info("attempting bad atomic underflow\n");
> - atomic_dec(&under);
> +#define ATOMIC_LKDTM_MIN(tag,fun) void lkdtm_ATOMIC_##tag(void) \
> +{ \
> + atomic_t atomic = ATOMIC_INIT(INT_MIN); \
> + \
> + pr_info("attempting good atomic_" #fun "\n"); \
> + atomic_inc(&atomic); \
> + TEST_FUNC(&atomic); \
> + \
> + pr_info("attempting bad atomic_" #fun "\n"); \
> + TEST_FUNC(&atomic); \
> }
>
> -void lkdtm_ATOMIC_OVERFLOW(void)
> -{
> - atomic_t over = ATOMIC_INIT(INT_MAX);
> +#define ATOMIC_LKDTM_MAX(tag,fun,...) \
> +void lkdtm_ATOMIC_##tag(void) \
> +{ \
> + atomic_t atomic = ATOMIC_INIT(INT_MAX); \
> + \
> + pr_info("attempting good atomic_" #fun "\n"); \
> + atomic_dec(&atomic); \
> + TEST_FUNC(&atomic); \
> + \
> + pr_info("attempting bad atomic_" #fun "\n"); \
> + TEST_FUNC(&atomic); \
> +}
>
> - pr_info("attempting good atomic decrement\n");
> - atomic_dec(&over);
> - atomic_inc(&over);
> +#define ATOMIC_LKDTM_LONG_MIN(tag,fun,...) \
> +void lkdtm_ATOMIC_LONG_##tag(void) \
> +{ \
> + atomic_long_t atomic = ATOMIC_LONG_INIT(LONG_MIN); \
> + \
> + pr_info("attempting good atomic_long_" #fun "\n"); \
> + atomic_long_inc(&atomic); \
> + TEST_FUNC(&atomic); \
> + \
> + pr_info("attempting bad atomic_long_" #fun "\n"); \
> + TEST_FUNC(&atomic); \
> +}
>
> - pr_info("attempting bad atomic overflow\n");
> - atomic_inc(&over);
> +#define ATOMIC_LKDTM_LONG_MAX(tag,fun,...) \
> +void lkdtm_ATOMIC_LONG_##tag(void) \
> +{ \
> + atomic_long_t atomic = ATOMIC_LONG_INIT(LONG_MAX); \
> + \
> + pr_info("attempting good atomic_long_" #fun "\n"); \
> + atomic_long_dec(&atomic); \
> + TEST_FUNC(&atomic); \
> + \
> + pr_info("attempting bad atomic_long_" #fun "\n"); \
> + TEST_FUNC(&atomic); \
> }
>
> +#define TEST_FUNC(x) atomic_dec(x)
> +ATOMIC_LKDTM_MIN(UNDERFLOW,dec)
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_dec_return(x)
> +ATOMIC_LKDTM_MIN(DEC_RETURN_UNDERFLOW,dec_return);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_sub(1,x)
> +ATOMIC_LKDTM_MIN(SUB_UNDERFLOW,sub);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_sub_return(1,x);
> +ATOMIC_LKDTM_MIN(SUB_RETURN_UNDERFLOW,sub_return);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_inc(x);
> +ATOMIC_LKDTM_MAX(OVERFLOW,inc);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_inc_return(x);
> +ATOMIC_LKDTM_MAX(INC_RETURN_OVERFLOW,inc_return);
Please note that this definition causes a compiler warning:
/home/akashi/arm/armv8/linaro/linux-aarch64/drivers/misc/lkdtm_bugs.c: In function 'lkdtm_ATOMIC_INC_AND_TEST_OVERFLOW':
/home/akashi/arm/armv8/linaro/linux-aarch64/arch/arm64/include/asm/atomic.h:222:55: warning: value computed is not used [-Wunused-value]
#define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
^
/home/akashi/arm/armv8/linaro/linux-aarch64/drivers/misc/lkdtm_bugs.c:204:22: note: in expansion of macro 'atomic_inc_and_test'
#define TEST_FUNC(x) atomic_inc_and_test(x);
Thanks,
-Takahiro AKASHI
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_add(1,x);
> +ATOMIC_LKDTM_MAX(ADD_OVERFLOW,add);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_add_return(1,x);
> +ATOMIC_LKDTM_MAX(ADD_RETURN_OVERFLOW,add_return);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_add_unless(x,1,0);
> +ATOMIC_LKDTM_MAX(ADD_UNLESS_OVERFLOW,add_unless);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_inc_and_test(x);
> +ATOMIC_LKDTM_MAX(INC_AND_TEST_OVERFLOW,inc_and_test);
> +#undef TEST_FUNC
> +
> +#define TEST_FUNC(x) atomic_long_dec(x);
> +ATOMIC_LKDTM_LONG_MIN(UNDERFLOW,dec);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_long_dec_return(x);
> +ATOMIC_LKDTM_LONG_MIN(DEC_RETURN_UNDERFLOW,dec_return);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_long_sub(1,x);
> +ATOMIC_LKDTM_LONG_MIN(SUB_UNDERFLOW,sub);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_long_sub_return(1,x);
> +ATOMIC_LKDTM_LONG_MIN(SUB_RETURN_UNDERFLOW,sub_return);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_long_inc(x);
> +ATOMIC_LKDTM_LONG_MAX(OVERFLOW,inc);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_long_inc_return(x);
> +ATOMIC_LKDTM_LONG_MAX(INC_RETURN_OVERFLOW,inc_return);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_long_add(1,x);
> +ATOMIC_LKDTM_LONG_MAX(ADD_OVERFLOW,add);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_long_add_return(1,x);
> +ATOMIC_LKDTM_LONG_MAX(ADD_RETURN_OVERFLOW,add_return);
> +#undef TEST_FUNC
> +#define TEST_FUNC(x) atomic_long_sub_and_test(1,x);
> +ATOMIC_LKDTM_LONG_MIN(SUB_AND_TEST,sub_and_test);
> +#undef TEST_FUNC
> +
> void lkdtm_CORRUPT_LIST_ADD(void)
> {
> /*
> diff --git a/drivers/misc/lkdtm_core.c b/drivers/misc/lkdtm_core.c
> index 7eeb71a..4b05803 100644
> --- a/drivers/misc/lkdtm_core.c
> +++ b/drivers/misc/lkdtm_core.c
> @@ -221,7 +221,24 @@ struct crashtype crashtypes[] = {
> CRASHTYPE(WRITE_RO_AFTER_INIT),
> CRASHTYPE(WRITE_KERN),
> CRASHTYPE(ATOMIC_UNDERFLOW),
> + CRASHTYPE(ATOMIC_DEC_RETURN_UNDERFLOW),
> + CRASHTYPE(ATOMIC_SUB_UNDERFLOW),
> + CRASHTYPE(ATOMIC_SUB_RETURN_UNDERFLOW),
> CRASHTYPE(ATOMIC_OVERFLOW),
> + CRASHTYPE(ATOMIC_INC_RETURN_OVERFLOW),
> + CRASHTYPE(ATOMIC_ADD_OVERFLOW),
> + CRASHTYPE(ATOMIC_ADD_RETURN_OVERFLOW),
> + CRASHTYPE(ATOMIC_ADD_UNLESS_OVERFLOW),
> + CRASHTYPE(ATOMIC_INC_AND_TEST_OVERFLOW),
> + CRASHTYPE(ATOMIC_LONG_UNDERFLOW),
> + CRASHTYPE(ATOMIC_LONG_DEC_RETURN_UNDERFLOW),
> + CRASHTYPE(ATOMIC_LONG_SUB_UNDERFLOW),
> + CRASHTYPE(ATOMIC_LONG_SUB_RETURN_UNDERFLOW),
> + CRASHTYPE(ATOMIC_LONG_OVERFLOW),
> + CRASHTYPE(ATOMIC_LONG_INC_RETURN_OVERFLOW),
> + CRASHTYPE(ATOMIC_LONG_ADD_OVERFLOW),
> + CRASHTYPE(ATOMIC_LONG_ADD_RETURN_OVERFLOW),
> + CRASHTYPE(ATOMIC_LONG_SUB_AND_TEST),
> CRASHTYPE(USERCOPY_HEAP_SIZE_TO),
> CRASHTYPE(USERCOPY_HEAP_SIZE_FROM),
> CRASHTYPE(USERCOPY_HEAP_FLAG_TO),
> --
> 2.7.4
>
next prev parent reply other threads:[~2016-10-25 8:56 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-20 10:25 [kernel-hardening] [RFC v2 PATCH 00/13] HARDENED_ATOMIC Elena Reshetova
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 01/13] Add architecture independent hardened atomic base Elena Reshetova
2016-10-24 23:04 ` [kernel-hardening] " Kees Cook
2016-10-25 0:28 ` Kees Cook
2016-10-25 7:57 ` [kernel-hardening] " Reshetova, Elena
2016-10-25 8:51 ` [kernel-hardening] " AKASHI Takahiro
2016-10-25 9:46 ` Hans Liljestrand
2016-10-26 7:38 ` AKASHI Takahiro
2016-10-27 13:47 ` Hans Liljestrand
2016-10-25 18:20 ` Reshetova, Elena
2016-10-25 22:18 ` Kees Cook
2016-10-26 10:27 ` Reshetova, Elena
2016-10-26 20:44 ` Kees Cook
2016-10-25 22:16 ` Kees Cook
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 02/13] percpu-refcount: leave atomic counter unprotected Elena Reshetova
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 03/13] kernel: identify wrapping atomic usage Elena Reshetova
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 04/13] mm: " Elena Reshetova
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 05/13] fs: " Elena Reshetova
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 06/13] net: " Elena Reshetova
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 07/13] net: atm: " Elena Reshetova
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 08/13] security: " Elena Reshetova
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 09/13] drivers: identify wrapping atomic usage (part 1/2) Elena Reshetova
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 10/13] drivers: identify wrapping atomic usage (part 2/2) Elena Reshetova
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 11/13] x86: identify wrapping atomic usage Elena Reshetova
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 12/13] x86: implementation for HARDENED_ATOMIC Elena Reshetova
2016-10-26 5:06 ` AKASHI Takahiro
2016-10-26 6:55 ` David Windsor
2016-10-26 11:15 ` Reshetova, Elena
2016-10-26 20:51 ` Kees Cook
2016-10-26 21:48 ` David Windsor
2016-10-26 21:52 ` Kees Cook
2016-10-20 10:25 ` [kernel-hardening] [RFC v2 PATCH 13/13] lkdtm: add tests for atomic over-/underflow Elena Reshetova
2016-10-24 23:14 ` Kees Cook
2016-10-25 8:56 ` AKASHI Takahiro [this message]
2016-10-25 9:04 ` Colin Vidal
2016-10-25 9:11 ` Hans Liljestrand
2016-10-25 18:30 ` Kees Cook
2016-10-20 13:13 ` [kernel-hardening] [RFC v2 PATCH 00/13] HARDENED_ATOMIC Hans Liljestrand
2016-10-24 22:38 ` Kees Cook
2016-10-25 9:05 ` Hans Liljestrand
2016-10-25 17:18 ` Colin Vidal
2016-10-25 17:51 ` David Windsor
2016-10-25 20:53 ` Colin Vidal
2016-10-26 8:17 ` Reshetova, Elena
2016-10-26 8:44 ` Colin Vidal
2016-10-26 9:46 ` Reshetova, Elena
2016-10-26 18:52 ` Colin Vidal
2016-10-26 19:47 ` Colin Vidal
2016-10-26 19:52 ` Kees Cook
2016-10-26 20:07 ` Colin Vidal
2016-10-27 7:35 ` Reshetova, Elena
2016-10-27 12:00 ` Reshetova, Elena
[not found] ` <CAEXv5_jDAPAqHp7vfOzU+WqN_h3g00_VUOz2_xxp9nJNzzFjxg@mail.gmail.com>
2016-10-27 13:03 ` David Windsor
2016-10-28 13:02 ` Reshetova, Elena
2016-10-28 15:20 ` David Windsor
2016-10-28 19:51 ` Reshetova, Elena
2016-10-29 5:27 ` David Windsor
2016-10-29 10:31 ` Reshetova, Elena
2016-10-29 11:48 ` David Windsor
2016-10-29 17:56 ` Reshetova, Elena
2016-10-29 18:05 ` David Windsor
2016-10-29 18:08 ` Reshetova, Elena
2016-10-28 8:37 ` Colin Vidal
2016-10-26 19:49 ` Kees Cook
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=20161025085655.GW19531@linaro.org \
--to=takahiro.akashi@linaro.org \
--cc=dwindsor@gmail.com \
--cc=elena.reshetova@intel.com \
--cc=ishkamiel@gmail.com \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.