SOURCES: linux-2.4-update.patch (NEW) - 2.4.33.1 diff without EXTR...

[qboosh]

Author: qboosh                       Date: Mon Aug 21 09:56:23 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 2.4.33.1 diff without EXTRAVERSION change and memchr export (already dealt with other patches)

---- Files affected:
SOURCES:
   linux-2.4-update.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/linux-2.4-update.patch
diff -u /dev/null SOURCES/linux-2.4-update.patch:1.1
--- /dev/null	Mon Aug 21 11:56:23 2006
+++ SOURCES/linux-2.4-update.patch	Mon Aug 21 11:56:18 2006
@@ -0,0 +1,109 @@
+
+Summary of changes from v2.4.33 to v2.4.33.1
+============================================
+
+dann frazier:
+      drivers/scsi/sg.c : fix CVE-2006-1528
+
+Jeff Layton:
+      2.4 NFS client - update d_cache when server reports ENOENT on an NFS remove
+
+Willy Tarreau:
+      [BLKMTD] : missing offset sometimes causes panics
+      [PKTGEN] : fix an oops when used with bonding driver (Tien ChenLi)
+      export memchr() which is used by smbfs and lp driver.
+      powerpc: Clear HID0 attention enable on PPC970 at boot time
+      Change VERSION to 2.4.33.1
+
+#diff --git a/Makefile b/Makefile
+#index fd6884d..6ef832b 100644
+#--- a/Makefile
+#+++ b/Makefile
+#@@ -1,7 +1,7 @@
+# VERSION = 2
+# PATCHLEVEL = 4
+# SUBLEVEL = 33
+#-EXTRAVERSION =
+#+EXTRAVERSION = .1
+# 
+# KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
+# 
+diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S
+index 34125f6..340a66a 100644
+--- a/arch/ppc/kernel/head.S
++++ b/arch/ppc/kernel/head.S
+@@ -1705,6 +1705,8 @@ ppc970_setup_hid:
+ 	mfspr	r0,SPRN_HID0
+ 	li	r11,5			/* clear DOZE and SLEEP */
+ 	rldimi	r0,r11,52,8		/* and set NAP and DPM */
++	li	r11,0
++	rldimi	r0,r11,32,31		/* clear EN_ATTN */
+ 	mtspr	SPRN_HID0,r0
+ 	mfspr	r0,SPRN_HID0
+ 	mfspr	r0,SPRN_HID0
+diff --git a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.c
+index f4280a1..9399d4e 100644
+--- a/drivers/mtd/devices/blkmtd.c
++++ b/drivers/mtd/devices/blkmtd.c
+@@ -195,6 +195,7 @@ static int commit_pages(struct blkmtd_de
+ 	int err = 0;
+ 
+ 	iobuf->length = iobuf->nr_pages << PAGE_SHIFT;
++	iobuf->offset = 0;	/* all pages are aligned */
+ 	iobuf->locked = 1;
+ 	if(iobuf->length) {
+ 		int i;
+diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
+index 905b8a0..8b8f281 100644
+--- a/drivers/scsi/sg.c
++++ b/drivers/scsi/sg.c
+@@ -1192,7 +1192,7 @@ static int sg_mmap(struct file * filp, s
+     	sg_rb_correct4mmap(rsv_schp, 1);  /* do only once per fd lifetime */
+ 	sfp->mmap_called = 1;
+     }
+-    vma->vm_flags |= (VM_RESERVED | VM_IO);
++    vma->vm_flags |= VM_RESERVED;
+     vma->vm_private_data = sfp;
+     vma->vm_ops = &sg_mmap_vm_ops;
+     return 0;
+diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
+index 48ab5af..30e03c2 100644
+--- a/fs/nfs/dir.c
++++ b/fs/nfs/dir.c
+@@ -860,7 +860,10 @@ #endif
+ 	if (inode)
+ 		NFS_CACHEINV(inode);
+ 	error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);
+-	if (error < 0)
++
++	/* if server returned ENOENT, assume that the dentry is already gone
++	 * and update the cache accordingly */
++	if (error < 0 && (error != -ENOENT))
+ 		goto out;
+ 	if (inode)
+ 		inode->i_nlink--;
+#diff --git a/kernel/ksyms.c b/kernel/ksyms.c
+#index d1e66c7..73ad3e9 100644
+#--- a/kernel/ksyms.c
+#+++ b/kernel/ksyms.c
+#@@ -579,6 +579,7 @@ EXPORT_SYMBOL(get_write_access);
+# EXPORT_SYMBOL(strnicmp);
+# EXPORT_SYMBOL(strspn);
+# EXPORT_SYMBOL(strsep);
+#+EXPORT_SYMBOL(memchr);
+# 
+# #ifdef CONFIG_CRC32
+# EXPORT_SYMBOL(crc32_le);
+diff --git a/net/core/pktgen.c b/net/core/pktgen.c
+index 1465093..75cce3f 100644
+--- a/net/core/pktgen.c
++++ b/net/core/pktgen.c
+@@ -510,6 +510,8 @@ static struct sk_buff *fill_packet(struc
+ 	skb->mac.raw = ((u8 *)iph) - 14;
+ 	skb->dev = odev;
+ 	skb->pkt_type = PACKET_HOST;
++	skb->nh.iph = iph;
++	skb->h.uh = udph;
+ 
+ 	if (info->nfrags <= 0) {
+                 pgh = (struct pktgen_hdr *)skb_put(skb, datalen);
================================================================