Skip to content

Commit

Permalink
ubifs: use prandom_bytes
Browse files Browse the repository at this point in the history
This also converts filling memory loop to use memset.

Signed-off-by: Akinobu 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Akinobu Mita authored and Linus Torvalds committed Dec 18, 2012
1 parent 7e45bf8 commit cdd9fa8
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions fs/ubifs/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
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;

from = random32() % (len + 1);
Expand All @@ -2571,11 +2571,9 @@ static int corrupt_data(const struct ubifs_info *c, const void *buf,
ffs ? "0xFFs" : "random data");

if (ffs)
for (i = from; i < to; i++)
p[i] = 0xFF;
memset(p + from, 0xFF, to - from);
else
for (i = from; i < to; i++)
p[i] = random32() % 0x100;
prandom_bytes(p + from, to - from);

return to;
}
Expand Down

0 comments on commit cdd9fa8

Please sign in to comment.