diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2012-12-17 16:04:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 17:15:26 -0800 |
| commit | cdd9fa8de64bc5b33d8e943dde486b60d8468ec0 (patch) | |
| tree | d21a5dbdfe30cc72edeef14d5e03a9de1d74082f | |
| parent | 7e45bf83f4cee68f0cfa9599007f8e089ea53365 (diff) | |
| download | kernel_goldelico_gta04-cdd9fa8de64bc5b33d8e943dde486b60d8468ec0.zip kernel_goldelico_gta04-cdd9fa8de64bc5b33d8e943dde486b60d8468ec0.tar.gz kernel_goldelico_gta04-cdd9fa8de64bc5b33d8e943dde486b60d8468ec0.tar.bz2 | |
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>
| -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 6291163..12817ff 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) 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); @@ -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; } |