Two comments/fixes for pre-2.0.30

Paul Gortmaker (paul@rasty.anu.edu.au)
Sat, 22 Mar 1997 15:14:42 +1000 (EST)


Hi,

Two small comments on pre-2.0.30:

1) EXT2 no-atime patch should use config.h and not autoconf.h as the
latter will cause mkdep to complain etc etc.

2) Putting CONFIG_<anything> in random.h is not a good idea. You don't know
if config.h has been included before random.h in all the places and mkdep
will probably complain about it. Putting include <config.h> at the
top of random.h is also not a good way to fix this, since there are
*lots* of drivers that include random.h but don't need config.h which
would then make a re-config recompile all of them for no reason.
Best to just stick the prototypes in without any surrounding #ifdef's.

Now that I've finished reading the patch, I'll try running it. :)

Regards,
Paul.

---------------------------------------------------------
Following patch against v2.0.29 + pre-patch-2.0.30.gz
MD5: b33582858ca6ca3ffab7f8098bf00d71 pre-patch-2.0.30.gz

diff -urN /tmp/linux/Documentation/Configure.help linux/Documentation/Configure.help
--- /tmp/linux/Documentation/Configure.help Sat Mar 22 14:59:04 1997
+++ linux/Documentation/Configure.help Sat Mar 22 14:58:42 1997
@@ -443,7 +443,7 @@
your computer and requires very little work for the attacker.
SYN cookies provide protection against this type of attack. With
this option turned on the TCP/IP stack will use a cryptographic
- challange protocol know as SYN cookies to enable legitimate users
+ challange protocol known as SYN cookies to enable legitimate users
to continue to connect, even when your machine is under attack.
The RST_COOKIES option provides an alternative method to accomplish
the same end. SYN cookies use less space than RST cookies,
@@ -458,7 +458,7 @@
your computer and requires very little work for the attacker.
SYN cookies provide protection against this type of attack. With
this option turned on the TCP/IP stack will use a cryptographic
- challange protocol know as RST cookies to enable legitimate users
+ challange protocol known as RST cookies to enable legitimate users
to continue to connect, even when your machine is under attack.
The SYN_COOKIES option provides an alternative method to accomplish
the same end. RST cookies use more space than SYN cookies on your
diff -urN /tmp/linux/fs/ext2/dir.c linux/fs/ext2/dir.c
--- /tmp/linux/fs/ext2/dir.c Sat Mar 22 14:59:08 1997
+++ linux/fs/ext2/dir.c Sat Mar 22 14:58:46 1997
@@ -17,7 +17,7 @@

#include <asm/segment.h>

-#include <linux/autoconf.h> /* For CONFIG_EXT2_NOATIME if enabled. */
+#include <linux/config.h> /* For CONFIG_EXT2_NOATIME if enabled. */

#include <linux/errno.h>
#include <linux/fs.h>
diff -urN /tmp/linux/fs/ext2/super.c linux/fs/ext2/super.c
--- /tmp/linux/fs/ext2/super.c Sat Mar 22 14:59:08 1997
+++ linux/fs/ext2/super.c Sat Mar 22 14:58:46 1997
@@ -21,7 +21,7 @@
#include <asm/segment.h>
#include <asm/system.h>

-#include <linux/autoconf.h> /* For CONFIG_EXT2_NOATIME if enabled. */
+#include <linux/config.h> /* For CONFIG_EXT2_NOATIME if enabled. */

#include <linux/errno.h>
#include <linux/fs.h>
diff -urN /tmp/linux/fs/ext2/symlink.c linux/fs/ext2/symlink.c
--- /tmp/linux/fs/ext2/symlink.c Sat Mar 22 14:59:08 1997
+++ linux/fs/ext2/symlink.c Sat Mar 22 14:58:46 1997
@@ -17,7 +17,7 @@

#include <asm/segment.h>

-#include <linux/autoconf.h> /* For CONFIG_EXT2_NOATIME if enabled. */
+#include <linux/config.h> /* For CONFIG_EXT2_NOATIME if enabled. */

#include <linux/errno.h>
#include <linux/fs.h>
diff -urN /tmp/linux/include/linux/random.h linux/include/linux/random.h
--- /tmp/linux/include/linux/random.h Sat Mar 22 14:59:09 1997
+++ linux/include/linux/random.h Sat Mar 22 15:00:35 1997
@@ -55,14 +55,13 @@

extern __u32 secure_tcp_sequence_number(__u32 saddr, __u32 daddr,
__u16 sport, __u16 dport);
-#ifdef CONFIG_RST_COOKIES
+/* For RST cookies */
__u32 secure_tcp_probe_number(__u32 saddr, __u32 daddr,
- __u16 sport, __u16 dport, __u32 sseq, int validate);
-#endif
-#ifdef CONFIG_SYN_COOKIES
+ __u16 sport, __u16 dport, __u32 sseq, int validate);
+
+/* For SYN cookies */
__u32 secure_tcp_syn_cookie(__u32 saddr, __u32 daddr,
- __u16 sport, __u16 dport, __u32 sseq, __u32 count);
-#endif
+ __u16 sport, __u16 dport, __u32 sseq, __u32 count);

#ifndef MODULE
extern struct file_operations random_fops, urandom_fops;
diff -urN /tmp/linux/mm/filemap.c linux/mm/filemap.c
--- /tmp/linux/mm/filemap.c Sat Mar 22 14:59:10 1997
+++ linux/mm/filemap.c Sat Mar 22 14:58:48 1997
@@ -9,7 +9,7 @@
* most "normal" filesystems (but you don't /have/ to use this:
* the NFS filesystem does this differently, for example)
*/
-#include <linux/autoconf.h> /* For CONFIG_EXT2_NOATIME if enabled. */
+#include <linux/config.h> /* For CONFIG_EXT2_NOATIME if enabled. */

#include <linux/stat.h>
#include <linux/sched.h>