linux-kernel - Re: [PATCH 6/6] lib/test_bitmap: add tests for bitmap_parselist

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190326101242.GU9224@smile.fi.intel.com>
Date:   Tue, 26 Mar 2019 12:12:42 +0200
From:   Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To:     Yury Norov <yury.norov@...il.com>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Rasmus Villemoes <linux@...musvillemoes.dk>,
        Arnd Bergmann <arnd@...db.de>,
        Kees Cook <keescook@...omium.org>,
        Matthew Wilcox <willy@...radead.org>,
        Tetsuo Handa <penguin-kernel@...ove.SAKURA.ne.jp>,
        Yury Norov <ynorov@...vell.com>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 6/6] lib/test_bitmap: add tests for bitmap_parselist_user

On Tue, Mar 26, 2019 at 12:07:48AM +0300, Yury Norov wrote:
> Propagate existing bitmap_parselist() tests to bitmap_parselist_user().

Increasing test coverage is a good point,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
for all test related patches

> 
> Signed-off-by: Yury Norov <ynorov@...vell.com>
> ---
>  lib/test_bitmap.c | 46 ++++++++++++++++++++++++++++++++++++----------
>  1 file changed, 36 insertions(+), 10 deletions(-)
> 
> diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c
> index 709424a788ee..d4ecac0da160 100644
> --- a/lib/test_bitmap.c
> +++ b/lib/test_bitmap.c
> @@ -11,6 +11,7 @@
>  #include <linux/printk.h>
>  #include <linux/slab.h>
>  #include <linux/string.h>
> +#include <linux/uaccess.h>
>  
>  static unsigned total_tests __initdata;
>  static unsigned failed_tests __initdata;
> @@ -278,39 +279,63 @@ static const struct test_bitmap_parselist parselist_tests[] __initconst = {
>  	{-EINVAL, "0-\n", NULL, 8, 0},
>  };
>  
> -static void __init test_bitmap_parselist(void)
> +static void __init __test_bitmap_parselist(int is_user)
>  {
>  	int i;
>  	int err;
>  	ktime_t time;
>  	DECLARE_BITMAP(bmap, 2048);
> +	char *mode = is_user ? "_user"  : "";
>  
>  	for (i = 0; i < ARRAY_SIZE(parselist_tests); i++) {
>  #define ptest parselist_tests[i]
>  
> -		time = ktime_get();
> -		err = bitmap_parselist(ptest.in, bmap, ptest.nbits);
> -		time = ktime_get() - time;
> +		if (is_user) {
> +			mm_segment_t orig_fs = get_fs();
> +			size_t len = strlen(ptest.in);
> +
> +			set_fs(KERNEL_DS);
> +			time = ktime_get();
> +			err = bitmap_parselist_user(ptest.in, len,
> +						    bmap, ptest.nbits);
> +			time = ktime_get() - time;
> +			set_fs(orig_fs);
> +		} else {
> +			time = ktime_get();
> +			err = bitmap_parselist(ptest.in, bmap, ptest.nbits);
> +			time = ktime_get() - time;
> +		}
>  
>  		if (err != ptest.errno) {
> -			pr_err("test %d: input is %s, errno is %d, expected %d\n",
> -					i, ptest.in, err, ptest.errno);
> +			pr_err("parselist%s: %d: input is %s, errno is %d, expected %d\n",
> +					mode, i, ptest.in, err, ptest.errno);
>  			continue;
>  		}
>  
>  		if (!err && ptest.expected
>  			 && !__bitmap_equal(bmap, ptest.expected, ptest.nbits)) {
> -			pr_err("test %d: input is %s, result is 0x%lx, expected 0x%lx\n",
> -					i, ptest.in, bmap[0], *ptest.expected);
> +			pr_err("parselist%s: %d: input is %s, result is 0x%lx, expected 0x%lx\n",
> +					mode, i, ptest.in, bmap[0],
> +					*ptest.expected);
>  			continue;
>  		}
>  
>  		if (ptest.flags & PARSE_TIME)
> -			pr_err("test %d: input is '%s' OK, Time: %llu\n",
> -					i, ptest.in, time);
> +			pr_err("parselist%s: %d: input is '%s' OK, Time: %llu\n",
> +					mode, i, ptest.in, time);
>  	}
>  }
>  
> +static void __init test_bitmap_parselist(void)
> +{
> +	__test_bitmap_parselist(0);
> +}
> +
> +static void __init test_bitmap_parselist_user(void)
> +{
> +	__test_bitmap_parselist(1);
> +}
> +
>  #define EXP_BYTES	(sizeof(exp) * 8)
>  
>  static void __init test_bitmap_arr32(void)
> @@ -383,6 +408,7 @@ static int __init test_bitmap_init(void)
>  	test_copy();
>  	test_bitmap_arr32();
>  	test_bitmap_parselist();
> +	test_bitmap_parselist_user();
>  	test_mem_optimisations();
>  
>  	if (failed_tests == 0)
> -- 
> 2.17.1
> 

-- 
With Best Regards,
Andy Shevchenko