d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix random.ko module.

Browse Source 
- Remove duplicated sources between standard part of the kernel and
  module.  In particular, it caused duplicated lock initialization and
  sysctl registration, both having bad consequences.
- Add missed source files to module.
- Static part of the kernel provides randomdev module, not
  random_adaptors.  Correct dependencies.
- Use cdev modules declaration macros.

Approved by:	secteam (delphij)
Reviewed by:	markm
This commit is contained in:
Konstantin Belousov 2014-11-07 20:23:43 +00:00
parent 4d1a2fee38
commit 48e279eaa7
5 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/random/ivy.c
View File

@ -132,4 +132,4 @@ rdrand_modevent(module_t mod, int type, void *unused)
DEV_MODULE(rdrand, rdrand_modevent, NULL);
MODULE_VERSION(rdrand, 1);
MODULE_DEPEND(rdrand, random_adaptors, 1, 1, 1);
MODULE_DEPEND(rdrand, randomdev, 1, 1, 1);

2
sys/dev/random/nehemiah.c
View File

@ -157,4 +157,4 @@ nehemiah_modevent(module_t mod, int type, void *unused)
DEV_MODULE(nehemiah, nehemiah_modevent, NULL);
MODULE_VERSION(nehemiah, 1);
MODULE_DEPEND(nehemiah, random_adaptors, 1, 1, 1);
MODULE_DEPEND(nehemiah, randomdev, 1, 1, 1);

10
sys/dev/random/randomdev.c
View File

@ -159,15 +159,7 @@ randomdev_modevent(module_t mod __unused, int type, void *data __unused)
return (error);
}
#define EARLY_2_DEV_MODULE(name, evh, arg) \
static moduledata_t name##_mod = { \
#name, \
evh, \
arg \
}; \
DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND)
EARLY_2_DEV_MODULE(randomdev, randomdev_modevent, NULL);
DEV_MODULE_ORDERED(randomdev, randomdev_modevent, NULL, SI_ORDER_SECOND);
MODULE_VERSION(randomdev, 1);
/* ================

16
sys/dev/random/randomdev_soft.c
View File

@ -153,21 +153,13 @@ randomdev_soft_modevent(module_t mod __unused, int type, void *unused __unused)
return (error);
}
#define MID_DEV_MODULE(name, evh, arg) \
static moduledata_t name##_mod = { \
#name, \
evh, \
arg \
}; \
DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE)
#if defined(RANDOM_YARROW)
MID_DEV_MODULE(yarrow, randomdev_soft_modevent, NULL);
DEV_MODULE(yarrow, randomdev_soft_modevent, NULL);
MODULE_VERSION(yarrow, 1);
MODULE_DEPEND(yarrow, random_adaptors, 1, 1, 1);
MODULE_DEPEND(yarrow, randomdev, 1, 1, 1);
#endif
#if defined(RANDOM_FORTUNA)
MID_DEV_MODULE(fortuna, randomdev_soft_modevent, NULL);
DEV_MODULE(fortuna, randomdev_soft_modevent, NULL);
MODULE_VERSION(fortuna, 1);
MODULE_DEPEND(fortuna, random_adaptors, 1, 1, 1);
MODULE_DEPEND(fortuna, randomdev, 1, 1, 1);
#endif

3
sys/modules/random/Makefile
View File

@ -6,8 +6,7 @@
KMOD= random
SRCS= randomdev_soft.c
SRCS+= yarrow.c hash.c
SRCS+= random_harvestq.c live_entropy_sources.c
SRCS+= yarrow.c fortuna.c hash.c
SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha2.c sha256c.c
SRCS+= bus_if.h device_if.h vnode_if.h opt_cpu.h opt_random.h