Attachment #15628 for bug #26071





  If you don't know what to use this for, you don't need it.

Allow Net Devices to contribute to /dev/random
CONFIG_NET_RANDOM
  If you say Y here, network device interrupts will contribute to the
  kernel entropy pool. Normally, block devices and some other devices
  feed the pool. Some systems, such as those that are headless or diskless,
  need additional entropy sources.  Some people, however, feel that network
  devices should not contribute to /dev/random because an external attacker
  could observe incoming packets in an attempt to learn the entropy pool's
  state.  If you say N, no network device will contribute entropy.

  If you believe there is a chance of your network packets being observed
  and you doubt the security of the entropy pool's one-way hash, do not
  enable this.  If unsure, say N.

Ethertap network tap (OBSOLETE)
CONFIG_ETHERTAP
  If you say Y here (and have said Y to "Kernel/User network link

Lines 9-14 Link Here

(-)linux-2.4.18/drivers/net/Config.in (+1 lines)
9	tristate 'Bonding driver support' CONFIG_BONDING	9	tristate 'Bonding driver support' CONFIG_BONDING
10	tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER	10	tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
11	tristate 'Universal TUN/TAP device driver support' CONFIG_TUN	11	tristate 'Universal TUN/TAP device driver support' CONFIG_TUN
		12	bool 'Allow Net Devices to contribute to /dev/random' CONFIG_NET_RANDOM
12	if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then	13	if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
13	tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP	14	tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP
14	fi	15	fi

Lines 121-128 Link Here

(-)linux-2.4.18/include/asm-alpha/signal.h (+7 lines)
121	#define SA_PROBE SA_ONESHOT	121	#define SA_PROBE SA_ONESHOT
122	#define SA_SAMPLE_RANDOM SA_RESTART	122	#define SA_SAMPLE_RANDOM SA_RESTART
123	#define SA_SHIRQ 0x40000000	123	#define SA_SHIRQ 0x40000000
		124
		125	#ifdef CONFIG_NET_RANDOM
		126	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		127	#else
		128	#define SA_NET_RANDOM 0
124	#endif	129	#endif
125		130
		131	#endif /* __KERNEL__ */
		132
126	#define SIG_BLOCK 1 /* for blocking signals */	133	#define SIG_BLOCK 1 /* for blocking signals */
127	#define SIG_UNBLOCK 2 /* for unblocking signals */	134	#define SIG_UNBLOCK 2 /* for unblocking signals */
128	#define SIG_SETMASK 3 /* for setting the signal mask */	135	#define SIG_SETMASK 3 /* for setting the signal mask */

Lines 126-133 Link Here

(-)linux-2.4.18/include/asm-arm/signal.h (+7 lines)
126	#define SA_SAMPLE_RANDOM 0x10000000	126	#define SA_SAMPLE_RANDOM 0x10000000
127	#define SA_IRQNOMASK 0x08000000	127	#define SA_IRQNOMASK 0x08000000
128	#define SA_SHIRQ 0x04000000	128	#define SA_SHIRQ 0x04000000
		129
		130	#ifdef CONFIG_NET_RANDOM
		131	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		132	#else
		133	#define SA_NET_RANDOM 0
129	#endif	134	#endif
130		135
		136	#endif /* __KERNEL__ */
		137
131	#define SIG_BLOCK 0 /* for blocking signals */	138	#define SIG_BLOCK 0 /* for blocking signals */
132	#define SIG_UNBLOCK 1 /* for unblocking signals */	139	#define SIG_UNBLOCK 1 /* for unblocking signals */
133	#define SIG_SETMASK 2 /* for setting the signal mask */	140	#define SIG_SETMASK 2 /* for setting the signal mask */

Lines 120-127 Link Here

(-)linux-2.4.18/include/asm-cris/signal.h (+7 lines)
120	#define SA_PROBE SA_ONESHOT	120	#define SA_PROBE SA_ONESHOT
121	#define SA_SAMPLE_RANDOM SA_RESTART	121	#define SA_SAMPLE_RANDOM SA_RESTART
122	#define SA_SHIRQ 0x04000000	122	#define SA_SHIRQ 0x04000000
		123
		124	#ifdef CONFIG_NET_RANDOM
		125	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		126	#else
		127	#define SA_NET_RANDOM 0
123	#endif	128	#endif
124		129
		130	#endif /* __KERNEL__ */
		131
125	#define SIG_BLOCK 0 /* for blocking signals */	132	#define SIG_BLOCK 0 /* for blocking signals */
126	#define SIG_UNBLOCK 1 /* for unblocking signals */	133	#define SIG_UNBLOCK 1 /* for unblocking signals */
127	#define SIG_SETMASK 2 /* for setting the signal mask */	134	#define SIG_SETMASK 2 /* for setting the signal mask */

Lines 119-126 Link Here

(-)linux-2.4.18/include/asm-i386/signal.h (+7 lines)
119	#define SA_PROBE SA_ONESHOT	119	#define SA_PROBE SA_ONESHOT
120	#define SA_SAMPLE_RANDOM SA_RESTART	120	#define SA_SAMPLE_RANDOM SA_RESTART
121	#define SA_SHIRQ 0x04000000	121	#define SA_SHIRQ 0x04000000
		122
		123	#ifdef CONFIG_NET_RANDOM
		124	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		125	#else
		126	#define SA_NET_RANDOM 0
122	#endif	127	#endif
123		128
		129	#endif /* __KERNEL__ */
		130
124	#define SIG_BLOCK 0 /* for blocking signals */	131	#define SIG_BLOCK 0 /* for blocking signals */
125	#define SIG_UNBLOCK 1 /* for unblocking signals */	132	#define SIG_UNBLOCK 1 /* for unblocking signals */
126	#define SIG_SETMASK 2 /* for setting the signal mask */	133	#define SIG_SETMASK 2 /* for setting the signal mask */

Lines 116-121 Link Here

(-)linux-2.4.18/include/asm-ia64/signal.h (+6 lines)
116	#define SA_SAMPLE_RANDOM SA_RESTART	116	#define SA_SAMPLE_RANDOM SA_RESTART
117	#define SA_SHIRQ 0x04000000	117	#define SA_SHIRQ 0x04000000
118		118
		119	#ifdef CONFIG_NET_RANDOM
		120	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		121	#else
		122	#define SA_NET_RANDOM 0
		123	#endif
		124
119	#endif /* __KERNEL__ */	125	#endif /* __KERNEL__ */
120		126
121	#define SIG_BLOCK 0 /* for blocking signals */	127	#define SIG_BLOCK 0 /* for blocking signals */

Lines 116-123 Link Here

(-)linux-2.4.18/include/asm-m68k/signal.h (+7 lines)
116	#define SA_PROBE SA_ONESHOT	116	#define SA_PROBE SA_ONESHOT
117	#define SA_SAMPLE_RANDOM SA_RESTART	117	#define SA_SAMPLE_RANDOM SA_RESTART
118	#define SA_SHIRQ 0x04000000	118	#define SA_SHIRQ 0x04000000
		119
		120	#ifdef CONFIG_NET_RANDOM
		121	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		122	#else
		123	#define SA_NET_RANDOM 0
119	#endif	124	#endif
120		125
		126	#endif /* __KERNEL__ */
		127
121	#define SIG_BLOCK 0 /* for blocking signals */	128	#define SIG_BLOCK 0 /* for blocking signals */
122	#define SIG_UNBLOCK 1 /* for unblocking signals */	129	#define SIG_UNBLOCK 1 /* for unblocking signals */
123	#define SIG_SETMASK 2 /* for setting the signal mask */	130	#define SIG_SETMASK 2 /* for setting the signal mask */

Lines 111-116 Link Here

(-)linux-2.4.18/include/asm-mips/signal.h (+6 lines)
111	#define SA_SAMPLE_RANDOM SA_RESTART	111	#define SA_SAMPLE_RANDOM SA_RESTART
112	#define SA_SHIRQ 0x02000000	112	#define SA_SHIRQ 0x02000000
113		113
		114	#ifdef CONFIG_NET_RANDOM
		115	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		116	#else
		117	#define SA_NET_RANDOM 0
		118	#endif
		119
114	#endif /* __KERNEL__ */	120	#endif /* __KERNEL__ */
115		121
116	#define SIG_BLOCK 1 /* for blocking signals */	122	#define SIG_BLOCK 1 /* for blocking signals */

Lines 111-116 Link Here

(-)linux-2.4.18/include/asm-mips64/signal.h (+6 lines)
111	#define SA_SAMPLE_RANDOM SA_RESTART	111	#define SA_SAMPLE_RANDOM SA_RESTART
112	#define SA_SHIRQ 0x02000000	112	#define SA_SHIRQ 0x02000000
113		113
		114	#ifdef CONFIG_NET_RANDOM
		115	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		116	#else
		117	#define SA_NET_RANDOM 0
		118	#endif
		119
114	#endif /* __KERNEL__ */	120	#endif /* __KERNEL__ */
115		121
116	#define SIG_BLOCK 1 /* for blocking signals */	122	#define SIG_BLOCK 1 /* for blocking signals */

Lines 100-105 Link Here

(-)linux-2.4.18/include/asm-parisc/signal.h (+6 lines)
100	#define SA_SAMPLE_RANDOM SA_RESTART	100	#define SA_SAMPLE_RANDOM SA_RESTART
101	#define SA_SHIRQ 0x04000000	101	#define SA_SHIRQ 0x04000000
102		102
		103	#ifdef CONFIG_NET_RANDOM
		104	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		105	#else
		106	#define SA_NET_RANDOM 0
		107	#endif
		108
103	#endif /* __KERNEL__ */	109	#endif /* __KERNEL__ */
104		110
105	#define SIG_BLOCK 0 /* for blocking signals */	111	#define SIG_BLOCK 0 /* for blocking signals */

Lines 114-121 Link Here

(-)linux-2.4.18/include/asm-ppc/signal.h (+7 lines)
114	#define SA_PROBE SA_ONESHOT	114	#define SA_PROBE SA_ONESHOT
115	#define SA_SAMPLE_RANDOM SA_RESTART	115	#define SA_SAMPLE_RANDOM SA_RESTART
116	#define SA_SHIRQ 0x04000000	116	#define SA_SHIRQ 0x04000000
		117
		118	#ifdef CONFIG_NET_RANDOM
		119	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		120	#else
		121	#define SA_NET_RANDOM 0
117	#endif	122	#endif
118		123
		124	#endif /* __KERNEL__ */
		125
119	#define SIG_BLOCK 0 /* for blocking signals */	126	#define SIG_BLOCK 0 /* for blocking signals */
120	#define SIG_UNBLOCK 1 /* for unblocking signals */	127	#define SIG_UNBLOCK 1 /* for unblocking signals */
121	#define SIG_SETMASK 2 /* for setting the signal mask */	128	#define SIG_SETMASK 2 /* for setting the signal mask */

Lines 127-134 Link Here

(-)linux-2.4.18/include/asm-s390/signal.h (+7 lines)
127	#define SA_PROBE SA_ONESHOT	127	#define SA_PROBE SA_ONESHOT
128	#define SA_SAMPLE_RANDOM SA_RESTART	128	#define SA_SAMPLE_RANDOM SA_RESTART
129	#define SA_SHIRQ 0x04000000	129	#define SA_SHIRQ 0x04000000
		130
		131	#ifdef CONFIG_NET_RANDOM
		132	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		133	#else
		134	#define SA_NET_RANDOM 0
130	#endif	135	#endif
131		136
		137	#endif /* __KERNEL__ */
		138
132	#define SIG_BLOCK 0 /* for blocking signals */	139	#define SIG_BLOCK 0 /* for blocking signals */
133	#define SIG_UNBLOCK 1 /* for unblocking signals */	140	#define SIG_UNBLOCK 1 /* for unblocking signals */
134	#define SIG_SETMASK 2 /* for setting the signal mask */	141	#define SIG_SETMASK 2 /* for setting the signal mask */

Lines 127-134 Link Here

(-)linux-2.4.18/include/asm-s390x/signal.h (+7 lines)
127	#define SA_PROBE SA_ONESHOT	127	#define SA_PROBE SA_ONESHOT
128	#define SA_SAMPLE_RANDOM SA_RESTART	128	#define SA_SAMPLE_RANDOM SA_RESTART
129	#define SA_SHIRQ 0x04000000	129	#define SA_SHIRQ 0x04000000
		130
		131	#ifdef CONFIG_NET_RANDOM
		132	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		133	#else
		134	#define SA_NET_RANDOM 0
130	#endif	135	#endif
131		136
		137	#endif /* __KERNEL__ */
		138
132	#define SIG_BLOCK 0 /* for blocking signals */	139	#define SIG_BLOCK 0 /* for blocking signals */
133	#define SIG_UNBLOCK 1 /* for unblocking signals */	140	#define SIG_UNBLOCK 1 /* for unblocking signals */
134	#define SIG_SETMASK 2 /* for setting the signal mask */	141	#define SIG_SETMASK 2 /* for setting the signal mask */

Lines 107-114 Link Here

(-)linux-2.4.18/include/asm-sh/signal.h (+7 lines)
107	#define SA_PROBE SA_ONESHOT	107	#define SA_PROBE SA_ONESHOT
108	#define SA_SAMPLE_RANDOM SA_RESTART	108	#define SA_SAMPLE_RANDOM SA_RESTART
109	#define SA_SHIRQ 0x04000000	109	#define SA_SHIRQ 0x04000000
		110
		111	#ifdef CONFIG_NET_RANDOM
		112	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		113	#else
		114	#define SA_NET_RANDOM 0
110	#endif	115	#endif
111		116
		117	#endif /* __KERNEL__ */
		118
112	#define SIG_BLOCK 0 /* for blocking signals */	119	#define SIG_BLOCK 0 /* for blocking signals */
113	#define SIG_UNBLOCK 1 /* for unblocking signals */	120	#define SIG_UNBLOCK 1 /* for unblocking signals */
114	#define SIG_SETMASK 2 /* for setting the signal mask */	121	#define SIG_SETMASK 2 /* for setting the signal mask */

Lines 176-183 Link Here

(-)linux-2.4.18/include/asm-sparc/signal.h (+7 lines)
176	#define SA_PROBE SA_ONESHOT	176	#define SA_PROBE SA_ONESHOT
177	#define SA_SAMPLE_RANDOM SA_RESTART	177	#define SA_SAMPLE_RANDOM SA_RESTART
178	#define SA_STATIC_ALLOC 0x80	178	#define SA_STATIC_ALLOC 0x80
		179
		180	#ifdef CONFIG_NET_RANDOM
		181	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		182	#else
		183	#define SA_NET_RANDOM 0
179	#endif	184	#endif
180		185
		186	#endif /* __KERNEL__ */
		187
181	/* Type of a signal handler. */	188	/* Type of a signal handler. */
182	#ifdef __KERNEL__	189	#ifdef __KERNEL__
183	typedef void (__sighandler_t)(int, int, struct sigcontext , char *);	190	typedef void (__sighandler_t)(int, int, struct sigcontext , char *);

Lines 192-199 Link Here

(-)linux-2.4.18/include/asm-sparc64/signal.h (+7 lines)
192	#define SA_PROBE SA_ONESHOT	192	#define SA_PROBE SA_ONESHOT
193	#define SA_SAMPLE_RANDOM SA_RESTART	193	#define SA_SAMPLE_RANDOM SA_RESTART
194	#define SA_STATIC_ALLOC 0x80	194	#define SA_STATIC_ALLOC 0x80
		195
		196	#ifdef CONFIG_NET_RANDOM
		197	#define SA_NET_RANDOM SA_SAMPLE_RANDOM
		198	#else
		199	#define SA_NET_RANDOM 0
195	#endif	200	#endif
196		201
		202	#endif /* __KERNEL__ */
		203
197	/* Type of a signal handler. */	204	/* Type of a signal handler. */
198	#ifdef __KERNEL__	205	#ifdef __KERNEL__
199	typedef void (__sighandler_t)(int, struct sigcontext );	206	typedef void (__sighandler_t)(int, struct sigcontext );

Return to bug 26071

Lines 9100-9105 Link Here

(-)linux-2.4.18/Documentation/Configure.help (+14 lines)
9100		9100
9101	If you don't know what to use this for, you don't need it.	9101	If you don't know what to use this for, you don't need it.
9102		9102
		9103	Allow Net Devices to contribute to /dev/random
		9104	CONFIG_NET_RANDOM
		9105	If you say Y here, network device interrupts will contribute to the
		9106	kernel entropy pool. Normally, block devices and some other devices
		9107	feed the pool. Some systems, such as those that are headless or diskless,
		9108	need additional entropy sources. Some people, however, feel that network
		9109	devices should not contribute to /dev/random because an external attacker
		9110	could observe incoming packets in an attempt to learn the entropy pool's
		9111	state. If you say N, no network device will contribute entropy.
		9112
		9113	If you believe there is a chance of your network packets being observed
		9114	and you doubt the security of the entropy pool's one-way hash, do not
		9115	enable this. If unsure, say N.
		9116
9103	Ethertap network tap (OBSOLETE)	9117	Ethertap network tap (OBSOLETE)
9104	CONFIG_ETHERTAP	9118	CONFIG_ETHERTAP
9105	If you say Y here (and have said Y to "Kernel/User network link	9119	If you say Y here (and have said Y to "Kernel/User network link