| Message ID | 20160803233913.32511-8-jason@lakedaemon.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 3 Aug 2016 23:39:13 +0000 Jason Cooper <jason@lakedaemon.net> wrote: > All call sites for randomize_range have been updated to use the much > simpler and more robust randomize_addr. Remove the now unnecessary > code. "randomize_page'. I think I'll grab these patches, see if anybody emits any squeaks.
On Wed, Aug 03, 2016 at 04:48:10PM -0700, Andrew Morton wrote: > On Wed, 3 Aug 2016 23:39:13 +0000 Jason Cooper <jason@lakedaemon.net> wrote: > > > All call sites for randomize_range have been updated to use the much > > simpler and more robust randomize_addr. Remove the now unnecessary > > code. > > "randomize_page'. Doh! > I think I'll grab these patches, see if anybody emits any squeaks. Thanks, Andrew! thx, Jason.
diff --git a/drivers/char/random.c b/drivers/char/random.c index 61cb434e3bea..46d332dd27a4 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1821,25 +1821,6 @@ unsigned long get_random_long(void) } EXPORT_SYMBOL(get_random_long); -/* - * randomize_range() returns a start address such that - * - * [...... <range> .....] - * start end - * - * a <range> with size "len" starting at the return value is inside in the - * area defined by [start, end], but is otherwise randomized. - */ -unsigned long -randomize_range(unsigned long start, unsigned long end, unsigned long len) -{ - unsigned long range = end - len - start; - - if (end <= start + len) - return 0; - return PAGE_ALIGN(get_random_int() % range + start); -} - /** * randomize_page - Generate a random, page aligned address * @start: The smallest acceptable address the caller will take. diff --git a/include/linux/random.h b/include/linux/random.h index 098fec690d65..9281dbbb7f4a 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -34,7 +34,6 @@ extern const struct file_operations random_fops, urandom_fops; unsigned int get_random_int(void); unsigned long get_random_long(void); -unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len); unsigned long randomize_page(unsigned long start, unsigned long range); u32 prandom_u32(void);
All call sites for randomize_range have been updated to use the much simpler and more robust randomize_addr. Remove the now unnecessary code. Signed-off-by: Jason Cooper <jason@lakedaemon.net> --- drivers/char/random.c | 19 ------------------- include/linux/random.h | 1 - 2 files changed, 20 deletions(-)