forked from Minki/linux
treewide: use get_random_bytes() when possible
The prandom_bytes() function has been a deprecated inline wrapper around get_random_bytes() for several releases now, and compiles down to the exact same code. Replace the deprecated wrapper with a direct call to the real function. This was done as a basic find and replace. Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Yury Norov <yury.norov@gmail.com> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> # powerpc Acked-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
parent
a251c17aa5
commit
197173db99
@ -82,7 +82,7 @@ static int __init crc_test_init(void)
|
|||||||
|
|
||||||
if (len <= offset)
|
if (len <= offset)
|
||||||
continue;
|
continue;
|
||||||
prandom_bytes(data, len);
|
get_random_bytes(data, len);
|
||||||
len -= offset;
|
len -= offset;
|
||||||
|
|
||||||
crypto_shash_update(crct10dif_shash, data+offset, len);
|
crypto_shash_update(crct10dif_shash, data+offset, len);
|
||||||
|
@ -539,7 +539,7 @@ static int blk_crypto_fallback_init(void)
|
|||||||
if (blk_crypto_fallback_inited)
|
if (blk_crypto_fallback_inited)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
prandom_bytes(blank_key, BLK_CRYPTO_MAX_KEY_SIZE);
|
get_random_bytes(blank_key, BLK_CRYPTO_MAX_KEY_SIZE);
|
||||||
|
|
||||||
err = bioset_init(&crypto_bio_split, 64, 0, 0);
|
err = bioset_init(&crypto_bio_split, 64, 0, 0);
|
||||||
if (err)
|
if (err)
|
||||||
|
@ -37,7 +37,7 @@ static void makedata(int disks)
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < disks; i++) {
|
for (i = 0; i < disks; i++) {
|
||||||
prandom_bytes(page_address(data[i]), PAGE_SIZE);
|
get_random_bytes(page_address(data[i]), PAGE_SIZE);
|
||||||
dataptrs[i] = data[i];
|
dataptrs[i] = data[i];
|
||||||
dataoffs[i] = 0;
|
dataoffs[i] = 0;
|
||||||
}
|
}
|
||||||
|
@ -312,7 +312,7 @@ static unsigned long dmatest_random(void)
|
|||||||
{
|
{
|
||||||
unsigned long buf;
|
unsigned long buf;
|
||||||
|
|
||||||
prandom_bytes(&buf, sizeof(buf));
|
get_random_bytes(&buf, sizeof(buf));
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1393,7 +1393,7 @@ static int ns_do_read_error(struct nandsim *ns, int num)
|
|||||||
unsigned int page_no = ns->regs.row;
|
unsigned int page_no = ns->regs.row;
|
||||||
|
|
||||||
if (ns_read_error(page_no)) {
|
if (ns_read_error(page_no)) {
|
||||||
prandom_bytes(ns->buf.byte, num);
|
get_random_bytes(ns->buf.byte, num);
|
||||||
NS_WARN("simulating read error in page %u\n", page_no);
|
NS_WARN("simulating read error in page %u\n", page_no);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -266,7 +266,7 @@ static int nand_ecc_test_run(const size_t size)
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
prandom_bytes(correct_data, size);
|
get_random_bytes(correct_data, size);
|
||||||
ecc_sw_hamming_calculate(correct_data, size, correct_ecc, sm_order);
|
ecc_sw_hamming_calculate(correct_data, size, correct_ecc, sm_order);
|
||||||
for (i = 0; i < ARRAY_SIZE(nand_ecc_test); i++) {
|
for (i = 0; i < ARRAY_SIZE(nand_ecc_test); i++) {
|
||||||
nand_ecc_test[i].prepare(error_data, error_ecc,
|
nand_ecc_test[i].prepare(error_data, error_ecc,
|
||||||
|
@ -223,7 +223,7 @@ static int __init mtd_speedtest_init(void)
|
|||||||
if (!iobuf)
|
if (!iobuf)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
prandom_bytes(iobuf, mtd->erasesize);
|
get_random_bytes(iobuf, mtd->erasesize);
|
||||||
|
|
||||||
bbt = kzalloc(ebcnt, GFP_KERNEL);
|
bbt = kzalloc(ebcnt, GFP_KERNEL);
|
||||||
if (!bbt)
|
if (!bbt)
|
||||||
|
@ -183,7 +183,7 @@ static int __init mtd_stresstest_init(void)
|
|||||||
goto out;
|
goto out;
|
||||||
for (i = 0; i < ebcnt; i++)
|
for (i = 0; i < ebcnt; i++)
|
||||||
offsets[i] = mtd->erasesize;
|
offsets[i] = mtd->erasesize;
|
||||||
prandom_bytes(writebuf, bufsize);
|
get_random_bytes(writebuf, bufsize);
|
||||||
|
|
||||||
bbt = kzalloc(ebcnt, GFP_KERNEL);
|
bbt = kzalloc(ebcnt, GFP_KERNEL);
|
||||||
if (!bbt)
|
if (!bbt)
|
||||||
|
@ -3874,7 +3874,7 @@ static void bnxt_init_vnics(struct bnxt *bp)
|
|||||||
|
|
||||||
if (bp->vnic_info[i].rss_hash_key) {
|
if (bp->vnic_info[i].rss_hash_key) {
|
||||||
if (i == 0)
|
if (i == 0)
|
||||||
prandom_bytes(vnic->rss_hash_key,
|
get_random_bytes(vnic->rss_hash_key,
|
||||||
HW_HASH_KEY_SIZE);
|
HW_HASH_KEY_SIZE);
|
||||||
else
|
else
|
||||||
memcpy(vnic->rss_hash_key,
|
memcpy(vnic->rss_hash_key,
|
||||||
|
@ -224,7 +224,7 @@ static int rocker_dma_test_offset(const struct rocker *rocker,
|
|||||||
if (err)
|
if (err)
|
||||||
goto unmap;
|
goto unmap;
|
||||||
|
|
||||||
prandom_bytes(buf, ROCKER_TEST_DMA_BUF_SIZE);
|
get_random_bytes(buf, ROCKER_TEST_DMA_BUF_SIZE);
|
||||||
for (i = 0; i < ROCKER_TEST_DMA_BUF_SIZE; i++)
|
for (i = 0; i < ROCKER_TEST_DMA_BUF_SIZE; i++)
|
||||||
expect[i] = ~buf[i];
|
expect[i] = ~buf[i];
|
||||||
err = rocker_dma_test_one(rocker, wait, ROCKER_TEST_DMA_CTRL_INVERT,
|
err = rocker_dma_test_one(rocker, wait, ROCKER_TEST_DMA_CTRL_INVERT,
|
||||||
|
@ -284,7 +284,7 @@ static __init bool randomized_test(void)
|
|||||||
mutex_lock(&mutex);
|
mutex_lock(&mutex);
|
||||||
|
|
||||||
for (i = 0; i < NUM_RAND_ROUTES; ++i) {
|
for (i = 0; i < NUM_RAND_ROUTES; ++i) {
|
||||||
prandom_bytes(ip, 4);
|
get_random_bytes(ip, 4);
|
||||||
cidr = prandom_u32_max(32) + 1;
|
cidr = prandom_u32_max(32) + 1;
|
||||||
peer = peers[prandom_u32_max(NUM_PEERS)];
|
peer = peers[prandom_u32_max(NUM_PEERS)];
|
||||||
if (wg_allowedips_insert_v4(&t, (struct in_addr *)ip, cidr,
|
if (wg_allowedips_insert_v4(&t, (struct in_addr *)ip, cidr,
|
||||||
@ -299,7 +299,7 @@ static __init bool randomized_test(void)
|
|||||||
}
|
}
|
||||||
for (j = 0; j < NUM_MUTATED_ROUTES; ++j) {
|
for (j = 0; j < NUM_MUTATED_ROUTES; ++j) {
|
||||||
memcpy(mutated, ip, 4);
|
memcpy(mutated, ip, 4);
|
||||||
prandom_bytes(mutate_mask, 4);
|
get_random_bytes(mutate_mask, 4);
|
||||||
mutate_amount = prandom_u32_max(32);
|
mutate_amount = prandom_u32_max(32);
|
||||||
for (k = 0; k < mutate_amount / 8; ++k)
|
for (k = 0; k < mutate_amount / 8; ++k)
|
||||||
mutate_mask[k] = 0xff;
|
mutate_mask[k] = 0xff;
|
||||||
@ -328,7 +328,7 @@ static __init bool randomized_test(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < NUM_RAND_ROUTES; ++i) {
|
for (i = 0; i < NUM_RAND_ROUTES; ++i) {
|
||||||
prandom_bytes(ip, 16);
|
get_random_bytes(ip, 16);
|
||||||
cidr = prandom_u32_max(128) + 1;
|
cidr = prandom_u32_max(128) + 1;
|
||||||
peer = peers[prandom_u32_max(NUM_PEERS)];
|
peer = peers[prandom_u32_max(NUM_PEERS)];
|
||||||
if (wg_allowedips_insert_v6(&t, (struct in6_addr *)ip, cidr,
|
if (wg_allowedips_insert_v6(&t, (struct in6_addr *)ip, cidr,
|
||||||
@ -343,7 +343,7 @@ static __init bool randomized_test(void)
|
|||||||
}
|
}
|
||||||
for (j = 0; j < NUM_MUTATED_ROUTES; ++j) {
|
for (j = 0; j < NUM_MUTATED_ROUTES; ++j) {
|
||||||
memcpy(mutated, ip, 16);
|
memcpy(mutated, ip, 16);
|
||||||
prandom_bytes(mutate_mask, 16);
|
get_random_bytes(mutate_mask, 16);
|
||||||
mutate_amount = prandom_u32_max(128);
|
mutate_amount = prandom_u32_max(128);
|
||||||
for (k = 0; k < mutate_amount / 8; ++k)
|
for (k = 0; k < mutate_amount / 8; ++k)
|
||||||
mutate_mask[k] = 0xff;
|
mutate_mask[k] = 0xff;
|
||||||
@ -381,13 +381,13 @@ static __init bool randomized_test(void)
|
|||||||
|
|
||||||
for (j = 0;; ++j) {
|
for (j = 0;; ++j) {
|
||||||
for (i = 0; i < NUM_QUERIES; ++i) {
|
for (i = 0; i < NUM_QUERIES; ++i) {
|
||||||
prandom_bytes(ip, 4);
|
get_random_bytes(ip, 4);
|
||||||
if (lookup(t.root4, 32, ip) != horrible_allowedips_lookup_v4(&h, (struct in_addr *)ip)) {
|
if (lookup(t.root4, 32, ip) != horrible_allowedips_lookup_v4(&h, (struct in_addr *)ip)) {
|
||||||
horrible_allowedips_lookup_v4(&h, (struct in_addr *)ip);
|
horrible_allowedips_lookup_v4(&h, (struct in_addr *)ip);
|
||||||
pr_err("allowedips random v4 self-test: FAIL\n");
|
pr_err("allowedips random v4 self-test: FAIL\n");
|
||||||
goto free;
|
goto free;
|
||||||
}
|
}
|
||||||
prandom_bytes(ip, 16);
|
get_random_bytes(ip, 16);
|
||||||
if (lookup(t.root6, 128, ip) != horrible_allowedips_lookup_v6(&h, (struct in6_addr *)ip)) {
|
if (lookup(t.root6, 128, ip) != horrible_allowedips_lookup_v6(&h, (struct in6_addr *)ip)) {
|
||||||
pr_err("allowedips random v6 self-test: FAIL\n");
|
pr_err("allowedips random v6 self-test: FAIL\n");
|
||||||
goto free;
|
goto free;
|
||||||
|
@ -2581,7 +2581,7 @@ static int corrupt_data(const struct ubifs_info *c, const void *buf,
|
|||||||
if (ffs)
|
if (ffs)
|
||||||
memset(p + from, 0xFF, to - from);
|
memset(p + from, 0xFF, to - from);
|
||||||
else
|
else
|
||||||
prandom_bytes(p + from, to - from);
|
get_random_bytes(p + from, to - from);
|
||||||
|
|
||||||
return to;
|
return to;
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ static bool __init test_encode_decode(void)
|
|||||||
unsigned long addr;
|
unsigned long addr;
|
||||||
size_t verif_size;
|
size_t verif_size;
|
||||||
|
|
||||||
prandom_bytes(&addr, sizeof(addr));
|
get_random_bytes(&addr, sizeof(addr));
|
||||||
if (addr < PAGE_SIZE)
|
if (addr < PAGE_SIZE)
|
||||||
addr = PAGE_SIZE;
|
addr = PAGE_SIZE;
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ EXPORT_SYMBOL(prandom_u32_state);
|
|||||||
* @bytes: the requested number of bytes
|
* @bytes: the requested number of bytes
|
||||||
*
|
*
|
||||||
* This is used for pseudo-randomness with no outside seeding.
|
* This is used for pseudo-randomness with no outside seeding.
|
||||||
* For more random results, use prandom_bytes().
|
* For more random results, use get_random_bytes().
|
||||||
*/
|
*/
|
||||||
void prandom_bytes_state(struct rnd_state *state, void *buf, size_t bytes)
|
void prandom_bytes_state(struct rnd_state *state, void *buf, size_t bytes)
|
||||||
{
|
{
|
||||||
|
@ -157,7 +157,7 @@ static int test_nodelta_obj_get(struct world *world, struct objagg *objagg,
|
|||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (should_create_root)
|
if (should_create_root)
|
||||||
prandom_bytes(world->next_root_buf,
|
get_random_bytes(world->next_root_buf,
|
||||||
sizeof(world->next_root_buf));
|
sizeof(world->next_root_buf));
|
||||||
|
|
||||||
objagg_obj = world_obj_get(world, objagg, key_id);
|
objagg_obj = world_obj_get(world, objagg, key_id);
|
||||||
|
@ -52,7 +52,7 @@ EXPORT_SYMBOL(generate_random_guid);
|
|||||||
|
|
||||||
static void __uuid_gen_common(__u8 b[16])
|
static void __uuid_gen_common(__u8 b[16])
|
||||||
{
|
{
|
||||||
prandom_bytes(b, 16);
|
get_random_bytes(b, 16);
|
||||||
/* reversion 0b10 */
|
/* reversion 0b10 */
|
||||||
b[8] = (b[8] & 0x3F) | 0x80;
|
b[8] = (b[8] & 0x3F) | 0x80;
|
||||||
}
|
}
|
||||||
|
@ -3719,7 +3719,7 @@ int __init ip_rt_init(void)
|
|||||||
|
|
||||||
ip_idents = idents_hash;
|
ip_idents = idents_hash;
|
||||||
|
|
||||||
prandom_bytes(ip_idents, (ip_idents_mask + 1) * sizeof(*ip_idents));
|
get_random_bytes(ip_idents, (ip_idents_mask + 1) * sizeof(*ip_idents));
|
||||||
|
|
||||||
ip_tstamps = idents_hash + (ip_idents_mask + 1) * sizeof(*ip_idents);
|
ip_tstamps = idents_hash + (ip_idents_mask + 1) * sizeof(*ip_idents);
|
||||||
|
|
||||||
|
@ -2036,7 +2036,7 @@ static void __init init_sample_table(void)
|
|||||||
|
|
||||||
memset(sample_table, 0xff, sizeof(sample_table));
|
memset(sample_table, 0xff, sizeof(sample_table));
|
||||||
for (col = 0; col < SAMPLE_COLUMNS; col++) {
|
for (col = 0; col < SAMPLE_COLUMNS; col++) {
|
||||||
prandom_bytes(rnd, sizeof(rnd));
|
get_random_bytes(rnd, sizeof(rnd));
|
||||||
for (i = 0; i < MCS_GROUP_RATES; i++) {
|
for (i = 0; i < MCS_GROUP_RATES; i++) {
|
||||||
new_idx = (i + rnd[i]) % MCS_GROUP_RATES;
|
new_idx = (i + rnd[i]) % MCS_GROUP_RATES;
|
||||||
while (sample_table[col][new_idx] != 0xff)
|
while (sample_table[col][new_idx] != 0xff)
|
||||||
|
@ -72,7 +72,7 @@ bool pie_drop_early(struct Qdisc *sch, struct pie_params *params,
|
|||||||
if (vars->accu_prob >= (MAX_PROB / 2) * 17)
|
if (vars->accu_prob >= (MAX_PROB / 2) * 17)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
prandom_bytes(&rnd, 8);
|
get_random_bytes(&rnd, 8);
|
||||||
if ((rnd >> BITS_PER_BYTE) < local_prob) {
|
if ((rnd >> BITS_PER_BYTE) < local_prob) {
|
||||||
vars->accu_prob = 0;
|
vars->accu_prob = 0;
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user