linux-kernel - Re: [PATCH RT 03/10] random: avoid preempt

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: Windows password security audit tool. GUI, reports in PDF.

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

Date:   Fri, 24 Nov 2017 14:26:40 +0800
From:   Alex Shi <alex.shi@...aro.org>
To:     Steven Rostedt <rostedt@...dmis.org>, linux-kernel@...r.kernel.org,
        linux-rt-users <linux-rt-users@...r.kernel.org>
Cc:     Thomas Gleixner <tglx@...utronix.de>,
        Carsten Emde <C.Emde@...dl.org>,
        Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
        John Kacur <jkacur@...hat.com>,
        Paul Gortmaker <paul.gortmaker@...driver.com>,
        Julia Cartwright <julia@...com>,
        Daniel Wagner <daniel.wagner@...mens.com>,
        tom.zanussi@...ux.intel.com
Subject: Re: [PATCH RT 03/10] random: avoid preempt_disable()ed section


Hi Steve,

I just build the patches, a build error found here:

drivers/char/random.c: In function ‘get_random_int’:
drivers/char/random.c:1816:7: error: assignment from incompatible
pointer type [-Werror=incompatible-pointer-types]
  hash = &get_locked_var(hash_entropy_int_lock, get_random_int_hash);
       ^
drivers/char/random.c: In function ‘get_random_long’:
drivers/char/random.c:1838:7: error: assignment from incompatible
pointer type [-Werror=incompatible-pointer-types]
  hash = &get_locked_var(hash_entropy_int_lock, get_random_int_hash);
       ^

> -	hash = get_cpu_var(get_random_int_hash);
> +	hash = &get_locked_var(hash_entropy_int_lock, get_random_int_hash);
               ^
Is this a extra '&' which need to remove?

>  
>  	hash[0] += current->pid + jiffies + random_get_entropy();
>  	md5_transform(hash, random_int_secret);
>  	ret = hash[0];
> -	put_cpu_var(get_random_int_hash);
> +	put_locked_var(hash_entropy_int_lock, get_random_int_hash);
>  
>  	return ret;
>  }
> @@ -1833,12 +1835,12 @@ unsigned long get_random_long(void)
>  	if (arch_get_random_long(&ret))
>  		return ret;
>  
> -	hash = get_cpu_var(get_random_int_hash);
> +	hash = &get_locked_var(hash_entropy_int_lock, get_random_int_hash);
               ^
Ditto

Regards
Alex