From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933198AbcHCXlY (ORCPT ); Wed, 3 Aug 2016 19:41:24 -0400 Received: from pmta2.delivery5.ore.mailhop.org ([54.186.218.12]:57664 "EHLO pmta2.delivery5.ore.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932959AbcHCXj5 (ORCPT ); Wed, 3 Aug 2016 19:39:57 -0400 X-MHO-User: c27449ed-59d3-11e6-8929-8ded99d5e9d7 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 74.99.77.15 X-Mail-Handler: DuoCircle Outbound SMTP From: Jason Cooper To: Kees Cook , Michael Ellerman , "Roberts, William C" , Yann Droneaud Cc: "Linux-MM" , LKML , "kernel-hardening" , "Russell King - ARM Linux" , Andrew Morton , "Theodore Ts'o" , Arnd Bergmann , gregkh@linuxfoundation.org, Catalin Marinas , Will Deacon , Ralf Baechle , benh@kernel.crashing.org, paulus@samba.org, "David S. Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , x86@kernel.org, viro@zeniv.linux.org.uk, Nick Kralevich , Jeffrey Vander Stoep , Daniel Cashman , Jason Cooper Subject: [PATCH v3 7/7] random: Remove unused randomize_range() Date: Wed, 3 Aug 2016 23:39:13 +0000 Message-Id: <20160803233913.32511-8-jason@lakedaemon.net> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160803233913.32511-1-jason@lakedaemon.net> References: <20160728204730.27453-1-jason@lakedaemon.net> <20160803233913.32511-1-jason@lakedaemon.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/char/random.c | 19 ------------------- include/linux/random.h | 1 - 2 files changed, 20 deletions(-) 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 - * - * [...... .....] - * start end - * - * a 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); -- 2.9.2