diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2012-12-17 19:04:23 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 20:15:26 -0500 |
commit | 496f2f93b1cc286f5a4f4f9acdc1e5314978683f (patch) | |
tree | 464fa6bd115ad4e3bedc02a0b0796a9f9e055ccc /drivers/scsi | |
parent | 31279b1457f992f24eee8d45ddd647f5fce42cf6 (diff) |
random32: rename random32 to prandom
This renames all random32 functions to have 'prandom_' prefix as follows:
void prandom_seed(u32 seed); /* rename from srandom32() */
u32 prandom_u32(void); /* rename from random32() */
void prandom_seed_state(struct rnd_state *state, u64 seed);
/* rename from prandom32_seed() */
u32 prandom_u32_state(struct rnd_state *state);
/* rename from prandom32() */
The purpose of this renaming is to prevent some kernel developers from
assuming that prandom32() and random32() might imply that only
prandom32() was the one using a pseudo-random number generator by
prandom32's "p", and the result may be a very embarassing security
exposure. This concern was expressed by Theodore Ts'o.
And furthermore, I'm going to introduce new functions for getting the
requested number of pseudo-random bytes. If I continue to use both
prandom32 and random32 prefixes for these functions, the confusion
is getting worse.
As a result of this renaming, "prandom_" is the common prefix for
pseudo-random number library.
Currently, srandom32() and random32() are preserved because it is
difficult to rename too many users at once.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Robert Love <robert.w.love@intel.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Cc: David Laight <david.laight@aculab.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/fcoe/fcoe_ctlr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c index 2ebe03a4b51d..4a909d7cfde1 100644 --- a/drivers/scsi/fcoe/fcoe_ctlr.c +++ b/drivers/scsi/fcoe/fcoe_ctlr.c | |||
@@ -2144,7 +2144,7 @@ static void fcoe_ctlr_vn_restart(struct fcoe_ctlr *fip) | |||
2144 | */ | 2144 | */ |
2145 | port_id = fip->port_id; | 2145 | port_id = fip->port_id; |
2146 | if (fip->probe_tries) | 2146 | if (fip->probe_tries) |
2147 | port_id = prandom32(&fip->rnd_state) & 0xffff; | 2147 | port_id = prandom_u32_state(&fip->rnd_state) & 0xffff; |
2148 | else if (!port_id) | 2148 | else if (!port_id) |
2149 | port_id = fip->lp->wwpn & 0xffff; | 2149 | port_id = fip->lp->wwpn & 0xffff; |
2150 | if (!port_id || port_id == 0xffff) | 2150 | if (!port_id || port_id == 0xffff) |
@@ -2169,7 +2169,7 @@ static void fcoe_ctlr_vn_restart(struct fcoe_ctlr *fip) | |||
2169 | static void fcoe_ctlr_vn_start(struct fcoe_ctlr *fip) | 2169 | static void fcoe_ctlr_vn_start(struct fcoe_ctlr *fip) |
2170 | { | 2170 | { |
2171 | fip->probe_tries = 0; | 2171 | fip->probe_tries = 0; |
2172 | prandom32_seed(&fip->rnd_state, fip->lp->wwpn); | 2172 | prandom_seed_state(&fip->rnd_state, fip->lp->wwpn); |
2173 | fcoe_ctlr_vn_restart(fip); | 2173 | fcoe_ctlr_vn_restart(fip); |
2174 | } | 2174 | } |
2175 | 2175 | ||