Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56de23dc authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Greg Kroah-Hartman
Browse files

random: selectively clang-format where it makes sense 



commit 248045b8dea5a32ddc0aa44193d6bc70c4b9cd8e upstream.

This is an old driver that has seen a lot of different eras of kernel
coding style. In an effort to make it easier to code for, unify the
coding style around the current norm, by accepting some of -- but
certainly not all of -- the suggestions from clang-format. This should
remove ambiguity in coding style, especially with regards to spacing,
when code is being changed or amended. Consequently it also makes code
review easier on the eyes, following one uniform style rather than
several.

Reviewed-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 86eac12b

drivers/char/random.c

+95 −106
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static ssize_t _extract_entropy(void *buf, size_t nbytes); 


static void crng_reseed(struct crng_state *crng, bool use_input_pool);



static u32 const twist_table[8] = {

static const u32 twist_table[8] = {

	0x00000000, 0x3b6e20c8, 0x76dc4190, 0x4db26158,

	0xedb88320, 0xd6d6a3e8, 0x9b64c2b0, 0xa00ae278 };
@@ -983,8 +983,7 @@ static void crng_reseed(struct crng_state *crng, bool use_input_pool) 
	crng_finalize_init(crng);

}



static void _extract_crng(struct crng_state *crng,

			  u8 out[CHACHA_BLOCK_SIZE])

static void _extract_crng(struct crng_state *crng, u8 out[CHACHA_BLOCK_SIZE])

{

	unsigned long flags, init_time;
@@ -1070,7 +1069,6 @@ static ssize_t extract_crng_user(void __user *buf, size_t nbytes) 
	return ret;

}





/*********************************************************************

 *

 * Entropy input management
@@ -1239,8 +1237,8 @@ void add_interrupt_randomness(int irq) 
	fast_pool->pool[1] ^= now ^ c_high;

	ip = regs ? instruction_pointer(regs) : _RET_IP_;

	fast_pool->pool[2] ^= ip;

	fast_pool->pool[3] ^= (sizeof(ip) > 4) ? ip >> 32 :

		get_reg(fast_pool, regs);

	fast_pool->pool[3] ^=

		(sizeof(ip) > 4) ? ip >> 32 : get_reg(fast_pool, regs);



	fast_mix(fast_pool);

	add_interrupt_bench(cycles);
@@ -1254,8 +1252,7 @@ void add_interrupt_randomness(int irq) 
		return;

	}



	if ((fast_pool->count < 64) &&

	    !time_after(now, fast_pool->last + HZ))

	if ((fast_pool->count < 64) && !time_after(now, fast_pool->last + HZ))

		return;



	if (!spin_trylock(&input_pool.lock))
@@ -1424,8 +1421,7 @@ static ssize_t extract_entropy(void *buf, size_t nbytes, int min) 
#define warn_unseeded_randomness(previous) \

	_warn_unseeded_randomness(__func__, (void *)_RET_IP_, (previous))



static void _warn_unseeded_randomness(const char *func_name, void *caller,

				      void **previous)

static void _warn_unseeded_randomness(const char *func_name, void *caller, void **previous)

{

#ifdef CONFIG_WARN_ALL_UNSEEDED_RANDOM

	const bool print_once = false;
@@ -1433,8 +1429,7 @@ static void _warn_unseeded_randomness(const char *func_name, void *caller, 
	static bool print_once __read_mostly;

#endif



	if (print_once ||

	    crng_ready() ||

	if (print_once || crng_ready() ||

	    (previous && (caller == READ_ONCE(*previous))))

		return;

	WRITE_ONCE(*previous, caller);
@@ -1442,9 +1437,8 @@ static void _warn_unseeded_randomness(const char *func_name, void *caller, 
	print_once = true;

#endif

	if (__ratelimit(&unseeded_warning))

		printk_deferred(KERN_NOTICE "random: %s called from %pS "

				"with crng_init=%d\n", func_name, caller,

				crng_init);

		printk_deferred(KERN_NOTICE "random: %s called from %pS with crng_init=%d\n",

				func_name, caller, crng_init);

}



/*
@@ -1487,7 +1481,6 @@ void get_random_bytes(void *buf, int nbytes) 
}

EXPORT_SYMBOL(get_random_bytes);





/*

 * Each time the timer fires, we expect that we got an unpredictable

 * jump in the cycle counter. Even if the timer is running on another
@@ -1736,9 +1729,8 @@ void rand_initialize_disk(struct gendisk *disk) 
}

#endif



static ssize_t

urandom_read_nowarn(struct file *file, char __user *buf, size_t nbytes,

		    loff_t *ppos)

static ssize_t urandom_read_nowarn(struct file *file, char __user *buf,

				   size_t nbytes, loff_t *ppos)

{

	int ret;
@@ -1748,8 +1740,8 @@ urandom_read_nowarn(struct file *file, char __user *buf, size_t nbytes, 
	return ret;

}



static ssize_t

urandom_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)

static ssize_t urandom_read(struct file *file, char __user *buf, size_t nbytes,

			    loff_t *ppos)

{

	static int maxwarn = 10;
@@ -1763,8 +1755,8 @@ urandom_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) 
	return urandom_read_nowarn(file, buf, nbytes, ppos);

}



static ssize_t

random_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)

static ssize_t random_read(struct file *file, char __user *buf, size_t nbytes,

			   loff_t *ppos)

{

	int ret;
@@ -1774,8 +1766,7 @@ random_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) 
	return urandom_read_nowarn(file, buf, nbytes, ppos);

}



static __poll_t

random_poll(struct file *file, poll_table * wait)

static __poll_t random_poll(struct file *file, poll_table *wait)

{

	__poll_t mask;
@@ -1789,8 +1780,7 @@ random_poll(struct file *file, poll_table * wait) 
	return mask;

}



static int

write_pool(const char __user *buffer, size_t count)

static int write_pool(const char __user *buffer, size_t count)

{

	size_t bytes;

	u32 t, buf[16];
@@ -1910,8 +1900,8 @@ const struct file_operations urandom_fops = { 
	.llseek = noop_llseek,

};



SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count,

		unsigned int, flags)

SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int,

		flags)

{

	int ret;
@@ -2176,8 +2166,7 @@ static void invalidate_batched_entropy(void) 
 * Return: A page aligned address within [start, start + range).  On error,

 * @start is returned.

 */

unsigned long

randomize_page(unsigned long start, unsigned long range)

unsigned long randomize_page(unsigned long start, unsigned long range)

{

	if (!PAGE_ALIGNED(start)) {

		range -= PAGE_ALIGN(start) - start;