Commit cdd9fa8d authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds

ubifs: use prandom_bytes

This also converts filling memory loop to use memset.
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: David Laight <david.laight@aculab.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Eilon Greenstein <eilong@broadcom.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Robert Love <robert.w.love@intel.com>
Cc: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7e45bf83
...@@ -2560,7 +2560,7 @@ static int power_cut_emulated(struct ubifs_info *c, int lnum, int write) ...@@ -2560,7 +2560,7 @@ static int power_cut_emulated(struct ubifs_info *c, int lnum, int write)
static int corrupt_data(const struct ubifs_info *c, const void *buf, static int corrupt_data(const struct ubifs_info *c, const void *buf,
unsigned int len) unsigned int len)
{ {
unsigned int from, to, i, ffs = chance(1, 2); unsigned int from, to, ffs = chance(1, 2);
unsigned char *p = (void *)buf; unsigned char *p = (void *)buf;
from = random32() % (len + 1); from = random32() % (len + 1);
...@@ -2571,11 +2571,9 @@ static int corrupt_data(const struct ubifs_info *c, const void *buf, ...@@ -2571,11 +2571,9 @@ static int corrupt_data(const struct ubifs_info *c, const void *buf,
ffs ? "0xFFs" : "random data"); ffs ? "0xFFs" : "random data");
if (ffs) if (ffs)
for (i = from; i < to; i++) memset(p + from, 0xFF, to - from);
p[i] = 0xFF;
else else
for (i = from; i < to; i++) prandom_bytes(p + from, to - from);
p[i] = random32() % 0x100;
return to; return to;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment