rpms/kernel/FC-4 kernel-2.6.spec, 1.1381, 1.1382 linux-2.6.11-tux.patch, 1.7, 1.8

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jun 24 01:57:48 UTC 2005


Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv28870

Modified Files:
	kernel-2.6.spec linux-2.6.11-tux.patch 
Log Message:
Prevent potential oops in tux with symlinks. (#160219)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1381
retrieving revision 1.1382
diff -u -r1.1381 -r1.1382
--- kernel-2.6.spec	24 Jun 2005 00:17:52 -0000	1.1381
+++ kernel-2.6.spec	24 Jun 2005 01:57:45 -0000	1.1382
@@ -1258,6 +1258,7 @@
   (Scanning/roaming/ethtool support).
 - Exec-shield randomisation fix.
 - pwc driver warning fix.
+- Prevent potential oops in tux with symlinks. (#160219)
 
 * Wed Jun 22 2005 Dave Jones <davej at redhat.com>
 - 2.6.12.1

linux-2.6.11-tux.patch:
 linux-2.6.11/arch/i386/kernel/syscall_table.S |   10 
 linux-2.6.12/kernel/exit.c                    |   10 
 linux-2.6.12/net/tux/directory.c              |    2 
 linux-2.6.12/net/tux/input.c                  |    2 
 linux-2.6.12/net/tux/proto_ftp.c              |    2 
 linux-2.6.12/net/tux/proto_http.c             |    2 
 linux-910/arch/alpha/kernel/systbls.S         |    8 
 linux-910/arch/ia64/kernel/entry.S            |    8 
 linux-910/arch/ia64/kernel/ia64_ksyms.c       |    3 
 linux-910/arch/ppc64/kernel/misc.S            |   20 
 linux-910/arch/x86_64/ia32/ia32entry.S        |   10 
 linux-910/fs/dcache.c                         |   36 
 linux-910/fs/exec.c                           |    2 
 linux-910/fs/fcntl.c                          |    4 
 linux-910/fs/namei.c                          |   18 
 linux-910/fs/namespace.c                      |    2 
 linux-910/fs/open.c                           |    4 
 linux-910/fs/pipe.c                           |    2 
 linux-910/fs/read_write.c                     |    2 
 linux-910/include/asm-alpha/fcntl.h           |    1 
 linux-910/include/asm-i386/fcntl.h            |    1 
 linux-910/include/asm-i386/unistd.h           |    5 
 linux-910/include/asm-ia64/fcntl.h            |    1 
 linux-910/include/asm-ia64/unistd.h           |    2 
 linux-910/include/asm-ppc/fcntl.h             |    1 
 linux-910/include/asm-ppc64/fcntl.h           |    1 
 linux-910/include/asm-s390/fcntl.h            |    1 
 linux-910/include/asm-sparc/fcntl.h           |    1 
 linux-910/include/asm-sparc64/fcntl.h         |    1 
 linux-910/include/asm-x86_64/fcntl.h          |    1 
 linux-910/include/asm-x86_64/unistd.h         |   10 
 linux-910/include/linux/buffer_head.h         |    1 
 linux-910/include/linux/dcache.h              |    8 
 linux-910/include/linux/errno.h               |    3 
 linux-910/include/linux/file.h                |    2 
 linux-910/include/linux/fs.h                  |    7 
 linux-910/include/linux/kmod.h                |    1 
 linux-910/include/linux/namei.h               |    2 
 linux-910/include/linux/net.h                 |    1 
 linux-910/include/linux/sched.h               |    5 
 linux-910/include/linux/skbuff.h              |    2 
 linux-910/include/linux/socket.h              |    5 
 linux-910/include/linux/sysctl.h              |   50 
 linux-910/include/net/sock.h                  |    6 
 linux-910/include/net/tcp.h                   |    8 
 linux-910/include/net/tux.h                   |  802 +++++++++
 linux-910/include/net/tux_u.h                 |  163 +
 linux-910/kernel/fork.c                       |    1 
 linux-910/kernel/kmod.c                       |   25 
 linux-910/kernel/signal.c                     |    1 
 linux-910/mm/filemap.c                        |   19 
 linux-910/mm/truncate.c                       |    2 
 linux-910/net/Kconfig                         |    2 
 linux-910/net/Makefile                        |    1 
 linux-910/net/ipv4/tcp.c                      |    3 
 linux-910/net/ipv4/tcp_input.c                |    1 
 linux-910/net/ipv4/tcp_ipv4.c                 |    5 
 linux-910/net/ipv4/tcp_minisocks.c            |    3 
 linux-910/net/ipv4/tcp_output.c               |    5 
 linux-910/net/socket.c                        |  139 +
 linux-910/net/tux/Kconfig                     |   25 
 linux-910/net/tux/Makefile                    |   12 
 linux-910/net/tux/abuf.c                      |  190 ++
 linux-910/net/tux/accept.c                    |  859 ++++++++++
 linux-910/net/tux/cachemiss.c                 |  265 +++
 linux-910/net/tux/cgi.c                       |  160 +
 linux-910/net/tux/directory.c                 |  302 +++
 linux-910/net/tux/extcgi.c                    |  329 +++
 linux-910/net/tux/gzip.c                      |   40 
 linux-910/net/tux/input.c                     |  640 +++++++
 linux-910/net/tux/logger.c                    |  836 +++++++++
 linux-910/net/tux/main.c                      | 1413 ++++++++++++++++
 linux-910/net/tux/mod.c                       |  262 +++
 linux-910/net/tux/output.c                    |  352 ++++
 linux-910/net/tux/parser.h                    |  102 +
 linux-910/net/tux/postpone.c                  |   77 
 linux-910/net/tux/proc.c                      | 1149 +++++++++++++
 linux-910/net/tux/proto_ftp.c                 | 1549 ++++++++++++++++++
 linux-910/net/tux/proto_http.c                | 2197 ++++++++++++++++++++++++++
 linux-910/net/tux/redirect.c                  |  162 +
 linux-910/net/tux/times.c                     |  392 ++++
 linux-910/net/tux/userspace.c                 |   27 
 linux/net/tux/times.h                         |   26 
 83 files changed, 12735 insertions(+), 77 deletions(-)

Index: linux-2.6.11-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6.11-tux.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6.11-tux.patch	21 Jun 2005 18:55:44 -0000	1.7
+++ linux-2.6.11-tux.patch	24 Jun 2005 01:57:45 -0000	1.8
@@ -13730,3 +13730,47 @@
 +#define TUX_YEAROFFSET   1997
 +#define TUX_NUMYEARS     10
 
+--- linux-2.6.12/net/tux/input.c~	2005-06-23 21:48:49.000000000 -0400
++++ linux-2.6.12/net/tux/input.c	2005-06-23 21:54:42.000000000 -0400
+@@ -114,7 +114,7 @@ struct dentry * tux_lookup (tux_req_t *r
+ 			const unsigned int flag, struct vfsmount **mnt)
+ {
+ 	struct dentry *dentry;
+-	struct nameidata base;
++	struct nameidata base = {};
+ 
+ 	Dprintk("tux_lookup(%p, %s, %d, virtual: %d, host: %s (%d).)\n", req, filename, flag, req->virtual, req->host, req->host_len);
+ 
+--- linux-2.6.12/net/tux/directory.c~	2005-06-23 21:54:53.000000000 -0400
++++ linux-2.6.12/net/tux/directory.c	2005-06-23 21:55:10.000000000 -0400
+@@ -80,7 +80,7 @@ static void do_dir_line (tux_req_t *req,
+ 	char string0[MAX_OBJECTNAME_LEN+200], *tmp;
+ 	int len, curroff, total, str_len = 0;
+ 	int err, flag = cachemiss ? 0 : LOOKUP_ATOMIC;
+-	struct nameidata base;
++	struct nameidata base={};
+ 	struct dentry *dentry = NULL;
+ 	struct inode *inode = NULL;
+ 	struct vfsmount *mnt = NULL;
+--- linux-2.6.12/net/tux/proto_ftp.c~	2005-06-23 21:55:20.000000000 -0400
++++ linux-2.6.12/net/tux/proto_ftp.c	2005-06-23 21:55:30.000000000 -0400
+@@ -103,7 +103,7 @@ static void ftp_execute_command (tux_req
+ static void ftp_lookup_vhost (tux_req_t *req, int cachemiss)
+ {
+ 	struct dentry *dentry;
+-	struct nameidata base;
++	struct nameidata base={};
+ 	struct vfsmount *mnt = NULL;
+ 	unsigned int flag = cachemiss ? 0 : LOOKUP_ATOMIC;
+ 	char ip[3+1+3+1+3+1+3 + 2];
+--- linux-2.6.12/net/tux/proto_http.c~	2005-06-23 21:55:36.000000000 -0400
++++ linux-2.6.12/net/tux/proto_http.c	2005-06-23 21:55:47.000000000 -0400
+@@ -1556,7 +1556,7 @@ done:
+ static void http_lookup_vhost (tux_req_t *req, int cachemiss)
+ {
+ 	struct dentry *dentry;
+-	struct nameidata base;
++	struct nameidata base={};
+ 	struct vfsmount *mnt = NULL;
+ 	unsigned int flag = cachemiss ? 0 : LOOKUP_ATOMIC;
+ 	




More information about the fedora-cvs-commits mailing list