Kernel package status

[Ron Yorston]

I've been having a look at the 34.7.legacy kernel.  Can someone explain
why the e1000 patch differs from that in Fedora Core 1's 2.4.22-1.2194
kernel?

Ron

34.7.legacy

--- 1.28/drivers/net/e1000/e1000_ethtool.c      2004-06-17 10:21:22 -07:00
+++ 1.29/drivers/net/e1000/e1000_ethtool.c      2004-06-17 10:21:22 -07:00
@@ -1514,6 +1514,9 @@

                if(copy_from_user(&regs, addr, sizeof(regs)))
                        return -EFAULT;
+               memset(regs_buff, 0, sizeof(regs_buff));
+               if (regs.len > E1000_REGS_LEN)
+                       regs.len = E1000_REGS_LEN;
                e1000_ethtool_gregs(adapter, &regs, regs_buff);
                if(copy_to_user(addr, &regs, sizeof(regs)))
                        return -EFAULT;

2194.nptl

--- linux-2.4.22/drivers/net/e1000/e1000_ethtool.c~     2004-06-04 12:58:57.907123544 +0100
+++ linux-2.4.22/drivers/net/e1000/e1000_ethtool.c      2004-06-04 13:00:08.752353432 +0100
@@ -1351,6 +1351,9 @@

                if(copy_from_user(&regs, addr, sizeof(regs)))
                        return -EFAULT;
+               memset(regs_buff, 0, sizeof(regs_buff));
+               if (regs.len > E1000_REGS_LEN * sizeof(uint32_t))
+                       regs.len = E1000_REGS_LEN * sizeof(uint32_t);
                e1000_ethtool_gregs(adapter, &regs, regs_buff);
                if(copy_to_user(addr, &regs, sizeof(regs)))
                        return -EFAULT;