Changeset 3917

Timestamp:

09/12/2006 01:39:02 AM (3 years ago)

Author:

BrainSlayer

Message:

watchdog and kernel update

Files:

• src/linux/brcm/linux.v24/.config (modified) (1 diff)
• src/linux/brcm/linux.v24/.config_std (modified) (2 diffs)
• src/linux/brcm/linux.v24/Makefile (modified) (2 diffs)
• src/linux/brcm/linux.v24/crypto/cipher.c (modified) (6 diffs)
• src/linux/brcm/linux.v24/drivers/block/cciss_scsi.c (modified) (2 diffs)
• src/linux/brcm/linux.v24/drivers/block/loop.c (modified) (1 diff)
• src/linux/brcm/linux.v24/drivers/net/wireless/wlcompat.c (modified) (9 diffs)
• src/linux/brcm/linux.v24/drivers/scsi/sg.c (modified) (1 diff)
• src/linux/brcm/linux.v24/fs/binfmt_elf.c (modified) (5 diffs)
• src/linux/brcm/linux.v24/fs/partitions/sun.c (modified) (1 diff)
• src/linux/brcm/linux.v24/fs/udf/super.c (modified) (1 diff)
• src/linux/brcm/linux.v24/fs/udf/truncate.c (modified) (1 diff)
• src/linux/brcm/linux.v24/include/net/sctp/sctp.h (modified) (1 diff)
• src/linux/brcm/linux.v24/include/net/sctp/sm.h (modified) (1 diff)
• src/linux/brcm/linux.v24/kernel/ksyms.c (modified) (1 diff)
• src/linux/brcm/linux.v24/net/sctp/sm_make_chunk.c (modified) (2 diffs)
• src/linux/brcm/linux.v24/net/sctp/sm_statefuns.c (modified) (3 diffs)
• src/linux/brcm/linux.v24/net/sctp/socket.c (modified) (2 diffs)

src/linux/brcm/linux.v24/.config

@@ -763 +763 @@
-# Watchdog Cards
-#
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-# CONFIG_SCx200 is not set
-# CONFIG_SCx200_GPIO is not set

src/linux/brcm/linux.v24/.config_std

@@ -322 +322 @@
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
+CONFIG_NET_IPWCCP=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
@@ -762 +763 @@
-# Watchdog Cards
-#
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-# CONFIG_SCx200 is not set
-# CONFIG_SCx200_GPIO is not set

src/linux/brcm/linux.v24/Makefile

@@ -2 +2 @@
-PATCHLEVEL = 4
-SUBLEVEL = 34
-1
+2
-
-KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -104 +104 @@
-
-CFLAGS += $(call check_gcc, -funit-at-a-time,)
-
+#
-#CFLAGS += $(call check_gcc, -fno-delayed-branch)
-

src/linux/brcm/linux.v24/crypto/cipher.c

@@ -148 +148 @@
-}
-
+static int ecb_encrypt_iv(struct crypto_tfm *tfm,
+                          struct scatterlist *dst,
+                          struct scatterlist *src,
+                          unsigned int nbytes, u8 *iv)
+{
+        ecb_encrypt(tfm, dst, src, nbytes);
+        return -ENOSYS;
+}
+
-static int ecb_decrypt(struct crypto_tfm *tfm,
-                       struct scatterlist *dst,
@@ -158 +167 @@
-}
-
+static int ecb_decrypt_iv(struct crypto_tfm *tfm,
+                          struct scatterlist *dst,
+                          struct scatterlist *src,
+                          unsigned int nbytes, u8 *iv)
+{
+        ecb_decrypt(tfm, dst, src, nbytes);
+        return -ENOSYS;
+}
+
-static int cbc_encrypt(struct crypto_tfm *tfm,
-                       struct scatterlist *dst,
@@ -198 +216 @@
-}
-
+/*
+ * nocrypt*() zeroize the destination buffer to make sure we don't leak
+ * uninitialized memory contents if the caller ignores the return value.
+ * This is bad since the data in the source buffer is unused and may be
+ * lost, but an infoleak would be even worse.  The performance cost of
+ * memset() is irrelevant since a well-behaved caller would not bump into
+ * the error repeatedly.
+ */
-static int nocrypt(struct crypto_tfm *tfm,
-                   struct scatterlist *dst,
@@ -203 +229 @@
-                   unsigned int nbytes)
-{
+        memset(dst, 0, nbytes);
-        return -ENOSYS;
-}
@@ -211 +238 @@
-                      unsigned int nbytes, u8 *iv)
-{
+        memset(dst, 0, nbytes);
-        return -ENOSYS;
-}
@@ -236 +264 @@
-                ops->cit_encrypt = ecb_encrypt;
-                ops->cit_decrypt = ecb_decrypt;
+/* These should have been nocrypt_iv, but patch-cryptoloop-jari-2.4.22.0
+ * (and its other revisions) directly calls the *_iv() functions even in
+ * ECB mode and ignores their return value. */
+                ops->cit_encrypt_iv = ecb_encrypt_iv;
+                ops->cit_decrypt_iv = ecb_decrypt_iv;
-                break;
-                

src/linux/brcm/linux.v24/drivers/block/cciss_scsi.c

@@ -50 +50 @@
-
-
-__init 
+
-int cciss_scsi_release(struct Scsi_Host *sh);
-const char *cciss_scsi_info(struct Scsi_Host *sa);
@@ -778 +778 @@
-   called from cciss.c:cciss_init_one().  */
-
- __init
+
-cciss_scsi_detect(Scsi_Host_Template *tpnt)
-{

src/linux/brcm/linux.v24/drivers/block/loop.c

@@ -694 +694 @@
-
-        lo->lo_bh = lo->lo_bhtail = NULL;
-
-
+
+
+
+
+
-
-        fput(file);
-        return 0;
-
+ out_clr:
+        lo->lo_backing_file = NULL;
+        lo->lo_device = 0;
+        lo->lo_flags = 0;
+        loop_sizes[lo->lo_number] = 0;
+        inode->i_mapping->gfp_mask = lo->old_gfp_mask;
+        lo->lo_state = Lo_unbound;
+        fput(file); /* yes, have to do it twice */
- out_putf:
-        fput(file);

src/linux/brcm/linux.v24/drivers/net/wireless/wlcompat.c

@@ -19 +19 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
-2529 2005-11-19 01:07:28
+4735 2006-09-03 04:54:21
- */
-
@@ -25 +25 @@
-#include <linux/config.h>
-#include <linux/module.h>
+#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/if_arp.h>
-#include <asm/uaccess.h>
-#include <linux/wireless.h>
+#include <linux/timer.h>
-
-#include <net/iw_handler.h>
@@ -36 +38 @@
-static unsigned short bss_force;
-static struct iw_statistics wstats;
+static int random = 1;
-char buf[WLC_IOCTL_MAXLEN];
-
@@ -44 +47 @@
-};
-#define NUM_CHANNELS ( sizeof(channel_frequency) / sizeof(channel_frequency[0]) )
+
+#define RNG_POLL_FREQ   20
-
-typedef struct internal_wsec_key {
@@ -978 +983 @@
-}
-
+static struct timer_list rng_timer;
+
+static void rng_timer_tick(unsigned long n)
+{
+        struct net_device *dev = (struct net_device *) n;
+        u16 data[4];
+        int i, ret;
+        
+        ret = 0;
+        for (i = 0; i < 3; i++) {
+                ret |= wl_get_val(dev, "rand", &data[i], sizeof(u16));
+        }
+        if (!ret)
+                batch_entropy_store(*((u32 *) &data[0]), *((u32 *) &data[2]), (jiffies % 255));
+
+        mod_timer(&rng_timer, jiffies + (HZ/RNG_POLL_FREQ));
+}
+
+
-static int __init wlcompat_init()
-{
-        int found = 0, i;
-*devname = "eth
+devname[4] = "wl
-        bss_force = 0;
-        
@@ -987 +1011 @@
-                if ((dev->wireless_handlers == NULL) && ((wl_ioctl(dev, WLC_GET_MAGIC, &i, sizeof(i)) == 0) && i == WLC_IOCTL_MAGIC))
-                        found = 1;
-3
+2
-        }
-        
@@ -1000 +1024 @@
-        dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
-        dev->get_wireless_stats = wlcompat_get_wireless_stats;
+
+        if (random) {
+                init_timer(&rng_timer);
+                rng_timer.function = rng_timer_tick;
+                rng_timer.data = (unsigned long) dev;
+                rng_timer_tick((unsigned long) dev);
+        }
+        
-#ifdef DEBUG
-        printk("broadcom driver private data: 0x%08x\n", dev->priv);
@@ -1008 +1040 @@
-static void __exit wlcompat_exit()
-{
+        if (random)
+                del_timer(&rng_timer);
-        dev->get_wireless_stats = NULL;
-        dev->wireless_handlers = NULL;
@@ -1018 +1052 @@
-MODULE_LICENSE("GPL");
-
+module_param(random, int, 0);
-module_init(wlcompat_init);
-module_exit(wlcompat_exit);

src/linux/brcm/linux.v24/drivers/scsi/sg.c

@@ -1193 +1193 @@
-        sfp->mmap_called = 1;
-    }
-(VM_RESERVED | VM_IO)
+VM_RESERVED
-    vma->vm_private_data = sfp;
-    vma->vm_ops = &sg_mmap_vm_ops;

src/linux/brcm/linux.v24/fs/binfmt_elf.c

@@ -87 +87 @@
-};
-
-
+=
-
-static int set_brk(unsigned long start, unsigned long end)
@@ -355 +355 @@
-             */
-            k = load_addr + eppnt->p_vaddr;
-k > TASK_SIZE
+BAD_ADDR(k)
-                eppnt->p_memsz > TASK_SIZE || TASK_SIZE - eppnt->p_memsz < k) {
-                error = -ENOMEM;
@@ -799 +799 @@
-                 * <= p_memsz so it is only necessary to check p_memsz.
-                 */
-k > TASK_SIZE
+BAD_ADDR(k)
-                    elf_ppnt->p_memsz > TASK_SIZE ||
-                    TASK_SIZE - elf_ppnt->p_memsz < k) {
@@ -851 +851 @@
-                                                    &interp_load_addr);
-                if (BAD_ADDR(elf_entry)) {
-
-
+
+
+
+
-                        force_sig(SIGSEGV, current);
-
+
+
-                        goto out_free_dentry;
-                }
@@ -862 +865 @@
-                fput(interpreter);
-                kfree(elf_interpreter);
+        } else {
+                if (BAD_ADDR(elf_entry)) {
+                        force_sig(SIGSEGV, current);
+                        retval = -EINVAL;
+                        goto out_free_dentry;
+                }
-        }
-

src/linux/brcm/linux.v24/fs/partitions/sun.c

@@ -87 +87 @@
-        for (i = 0; i < 8; i++, p++) {
-                unsigned long st_sector;
-
+unsigned 
-
-                st_sector = first_sector + be32_to_cpu(p->start_cylinder) * spc;

src/linux/brcm/linux.v24/fs/udf/super.c

@@ -1516 +1516 @@
-                goto error_out;
-        }
-MAX_LFS_FILESIZE
+1<<30
-        return sb;
-

src/linux/brcm/linux.v24/fs/udf/truncate.c

@@ -183 +183 @@
-                if (offset)
-                {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                                memset(&eloc, 0x00, sizeof(lb_addr));
-                                elen = EXT_NOT_RECORDED_NOT_ALLOCATED | offset;
-                                udf_add_aext(inode, &bloc, &extoffset, eloc, elen, &bh, 1);
-                        }
+                        else {
+                                extoffset -= adsize;
+                                etype = udf_next_aext(inode, &bloc, &extoffset, &eloc, &elen, &bh, 1);
+                                if (etype == (EXT_NOT_RECORDED_NOT_ALLOCATED >> 30))
+                                {
+                                        extoffset -= adsize;
+                                        elen = EXT_NOT_RECORDED_NOT_ALLOCATED | (elen + offset);
+                                        udf_write_aext(inode, bloc, &extoffset, eloc, elen, bh, 0);
+                                }
+                                else if (etype == (EXT_NOT_RECORDED_ALLOCATED >> 30))
+                                {
+                                        lb_addr neloc = { 0, 0 };
+                                        extoffset -= adsize;
+                                        nelen = EXT_NOT_RECORDED_NOT_ALLOCATED |
+                                                ((elen + offset + inode->i_sb->s_blocksize - 1) &
+                                                ~(inode->i_sb->s_blocksize - 1));
+                                        udf_write_aext(inode, bloc, &extoffset, neloc, nelen, bh, 1);
+                                        udf_add_aext(inode, &bloc, &extoffset, eloc, (etype << 30) | elen, &bh, 1);
+                                }
+                                else
+                                {
+                                        if (elen & (inode->i_sb->s_blocksize - 1))
+                                        {
+                                                extoffset -= adsize;
+                                                elen = EXT_RECORDED_ALLOCATED |
+                                                        ((elen + inode->i_sb->s_blocksize - 1) &
+                                                        ~(inode->i_sb->s_blocksize - 1));
+                                                udf_write_aext(inode, bloc, &extoffset, eloc, elen, bh, 1);
+                                        }
+                                        memset(&eloc, 0x00, sizeof(lb_addr));
+                                        elen = EXT_NOT_RECORDED_NOT_ALLOCATED | offset;
+                                        udf_add_aext(inode, &bloc, &extoffset, eloc, elen, &bh, 1);
+                                }
+                        }
-                }
-        }

src/linux/brcm/linux.v24/include/net/sctp/sctp.h

@@ -411 +411 @@
-}
-
-/* Calculate the size (in bytes) occupied by the data of an iovec.  */
-static inline size_t get_user_iov_size(struct iovec *iov, int iovlen)
-{
-        size_t retval = 0;
-
-        for (; iovlen > 0; --iovlen) {
-                retval += iov->iov_len;
-                iov++;
-        }
-
-        return retval;
-}
-
-/* Generate a random jitter in the range of -50% ~ +50% of input RTO. */
-static inline __s32 sctp_jitter(__u32 rto)

src/linux/brcm/linux.v24/include/net/sctp/sm.h

@@ -222 +222 @@
-                                      __u32 tsn);
-struct sctp_chunk *sctp_make_abort_user(const struct sctp_association *,
-
-
+
-struct sctp_chunk *sctp_make_abort_violation(const struct sctp_association *,
-                                   const struct sctp_chunk *,

src/linux/brcm/linux.v24/kernel/ksyms.c

@@ -582 +582 @@
-EXPORT_SYMBOL(memchr);
-
+
-#ifdef CONFIG_CRC32
-EXPORT_SYMBOL(crc32_le);

src/linux/brcm/linux.v24/net/sctp/sm_make_chunk.c

@@ -799 +799 @@
-/* Helper to create ABORT with a SCTP_ERROR_USER_ABORT error.  */
-struct sctp_chunk *sctp_make_abort_user(const struct sctp_association *asoc,
-   const struct sctp_chunk *chunk
-   const struct msghdr *msg
+       const struct msghdr *msg
+       size_t paylen
-{
-        struct sctp_chunk *retval;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        if (!retval)
-                goto err_chunk;
@@ -820 +812 @@
-        if (paylen) {
-                /* Put the msg_iov together into payload.  */
-ATOMIC
+KERNEL
-                if (!payload)
-                        goto err_payload;
-
-
-
-
-
-
-
-
+
+
+
+
-        }
-

src/linux/brcm/linux.v24/net/sctp/sm_statefuns.c

@@ -3991 +3991 @@
-         * if necessary to fill gaps.
-         */
-
-
+
-        sctp_disposition_t retval;
-
-        retval = SCTP_DISPOSITION_CONSUME;
-
-
-
-
-
-
-
+
-
-        /* Even if we can't send the ABORT due to low memory delete the
@@ -4124 +4118 @@
-        sctp_cmd_seq_t *commands)
-{
-
-
+
-        sctp_disposition_t retval;
-
@@ -4133 +4126 @@
-        retval = SCTP_DISPOSITION_CONSUME;
-
-
-
-
-
-
-
+
-
-        sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE,

src/linux/brcm/linux.v24/net/sctp/socket.c

@@ -968 +968 @@
-                                sctp_association_free(asoc);
-
-
-
-
+
+
+
+
+
+
+
-                                sctp_primitive_SHUTDOWN(asoc, NULL);
-                } else
@@ -1200 +1204 @@
-                }
-                if (sinfo_flags & MSG_ABORT) {
+                        struct sctp_chunk *chunk;
+
+                        chunk = sctp_make_abort_user(asoc, msg, msg_len);
+                        if (!chunk) {
+                                err = -ENOMEM;
+                                goto out_unlock;
+                        }
+
-                        SCTP_DEBUG_PRINTK("Aborting association: %p\n", asoc);
-msg
+chunk
-                        err = 0;
-                        goto out_unlock;