Commit 38e9efcd authored Nov 11, 2013 by Daniel Borkmann Committed by David S. Miller Nov 11, 2013

random32: move rnd_state to linux/random.h



struct rnd_state got mistakenly pulled into uapi header. It is not
used anywhere and does also not belong there!

Commit 5960164f ("lib/random32: export pseudo-random number
generator for modules"), the last commit on rnd_state before it
got moved to uapi, says:

  This patch moves the definition of struct rnd_state and the inline
  __seed() function to linux/random.h.  It renames the static __random32()
  function to prandom32() and exports it for use in modules.

Hence, the structure was moved from lib/random32.c to linux/random.h
so that it can be used within modules (FCoE-related code in this
case), but not from user space. However, it seems to have been
mistakenly moved to uapi header through the uapi script. Since no-one
should make use of it from the linux headers, move the structure back
to the kernel for internal use, so that it can be modified on demand.

Joint work with Hannes Frederic Sowa.

Cc: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 4af712e8

include/linux/random.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,10 @@ void prandom_bytes(void *buf, int nbytes);
		void prandom_seed(u32 seed);
		void prandom_reseed_late(void);

		struct rnd_state {
		__u32 s1, s2, s3;
		};

		u32 prandom_u32_state(struct rnd_state *);
		void prandom_bytes_state(struct rnd_state state, void buf, int nbytes);

include/uapi/linux/random.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -40,11 +40,4 @@ struct rand_pool_info {
		__u32 buf[0];
		};

		struct rnd_state {
		__u32 s1, s2, s3;
		};

		/* Exported functions */


		#endif /* _UAPI_LINUX_RANDOM_H */

Admin message