diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2012-12-17 19:04:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 20:15:26 -0500 |
commit | cdd9fa8de64bc5b33d8e943dde486b60d8468ec0 (patch) | |
tree | d21a5dbdfe30cc72edeef14d5e03a9de1d74082f /fs/ubifs | |
parent | 7e45bf83f4cee68f0cfa9599007f8e089ea53365 (diff) |
ubifs: use prandom_bytes
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>
Diffstat (limited to 'fs/ubifs')
-rw-r--r-- | fs/ubifs/debug.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 62911637e12f..12817ffc7345 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c | |||
@@ -2560,7 +2560,7 @@ static int power_cut_emulated(struct ubifs_info *c, int lnum, int write) | |||
2560 | static int corrupt_data(const struct ubifs_info *c, const void *buf, | 2560 | static int corrupt_data(const struct ubifs_info *c, const void *buf, |
2561 | unsigned int len) | 2561 | unsigned int len) |
2562 | { | 2562 | { |
2563 | unsigned int from, to, i, ffs = chance(1, 2); | 2563 | unsigned int from, to, ffs = chance(1, 2); |
2564 | unsigned char *p = (void *)buf; | 2564 | unsigned char *p = (void *)buf; |
2565 | 2565 | ||
2566 | from = random32() % (len + 1); | 2566 | from = random32() % (len + 1); |
@@ -2571,11 +2571,9 @@ static int corrupt_data(const struct ubifs_info *c, const void *buf, | |||
2571 | ffs ? "0xFFs" : "random data"); | 2571 | ffs ? "0xFFs" : "random data"); |
2572 | 2572 | ||
2573 | if (ffs) | 2573 | if (ffs) |
2574 | for (i = from; i < to; i++) | 2574 | memset(p + from, 0xFF, to - from); |
2575 | p[i] = 0xFF; | ||
2576 | else | 2575 | else |
2577 | for (i = from; i < to; i++) | 2576 | prandom_bytes(p + from, to - from); |
2578 | p[i] = random32() % 0x100; | ||
2579 | 2577 | ||
2580 | return to; | 2578 | return to; |
2581 | } | 2579 | } |