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

Commit e954bc91 authored by Matt Mackall's avatar Matt Mackall Committed by Herbert Xu
Browse files

random: simplify fips mode 



Rather than dynamically allocate 10 bytes, move it to static allocation.
This saves space and avoids the need for error checking.

Signed-off-by: default avatarMatt Mackall <mpm@selenic.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 921bae54

drivers/char/random.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -257,6 +257,7 @@ 
#define INPUT_POOL_WORDS 128

#define INPUT_POOL_WORDS 128

#define OUTPUT_POOL_WORDS 32

#define OUTPUT_POOL_WORDS 32

#define SEC_XFER_SIZE 512

#define SEC_XFER_SIZE 512

#define EXTRACT_SIZE 10





/*

/*

 * The minimum number of bits of entropy before we wake up a read on

 * The minimum number of bits of entropy before we wake up a read on
@@ -414,7 +415,7 @@ struct entropy_store { 
	unsigned add_ptr;

	unsigned add_ptr;

	int entropy_count;

	int entropy_count;

	int input_rotate;

	int input_rotate;

	__u8 *last_data;

	__u8 last_data[EXTRACT_SIZE];

};

};





static __u32 input_pool_data[INPUT_POOL_WORDS];

static __u32 input_pool_data[INPUT_POOL_WORDS];
@@ -714,8 +715,6 @@ void add_disk_randomness(struct gendisk *disk) 
}

}

#endif

#endif





#define EXTRACT_SIZE 10



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

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

 *

 *

 * Entropy extraction routines

 * Entropy extraction routines
@@ -862,7 +861,7 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf, 
	while (nbytes) {

	while (nbytes) {

		extract_buf(r, tmp);

		extract_buf(r, tmp);





		if (r->last_data) {

		if (fips_enabled) {

			spin_lock_irqsave(&r->lock, flags);

			spin_lock_irqsave(&r->lock, flags);

			if (!memcmp(tmp, r->last_data, EXTRACT_SIZE))

			if (!memcmp(tmp, r->last_data, EXTRACT_SIZE))

				panic("Hardware RNG duplicated output!\n");

				panic("Hardware RNG duplicated output!\n");
@@ -951,9 +950,6 @@ static void init_std_data(struct entropy_store *r) 
	now = ktime_get_real();

	now = ktime_get_real();

	mix_pool_bytes(r, &now, sizeof(now));

	mix_pool_bytes(r, &now, sizeof(now));

	mix_pool_bytes(r, utsname(), sizeof(*(utsname())));

	mix_pool_bytes(r, utsname(), sizeof(*(utsname())));

	/* Enable continuous test in fips mode */

	if (fips_enabled)

		r->last_data = kmalloc(EXTRACT_SIZE, GFP_KERNEL);

}

}





static int rand_initialize(void)

static int rand_initialize(void)