r3837 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2005-08-11 06:18:44 +0000 (Thu, 11 Aug 2005)
New Revision: 3837

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/vlan-mii-ioctl.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
Log:
+     [May Be Security] MII ioctl pass through was passing the wrong device.
+     See http://lists.osdl.org/pipermail/bridge/2004-September/000638.html
+     (Closes: #309308)


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-08-11 02:39:12 UTC (rev 3836)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-08-11 06:18:44 UTC (rev 3837)
@@ -146,7 +146,7 @@
   * Merge in applicable fixes from 2.6.12.4
      - netfilter-NAT-memory-corruption.dpatch
      - netfilter-deadlock-ip6_queue.dpatch
-     - [Security] ipsec-array-overflow.dpatch See CAN-2005-2456 
+     - [Security] ipsec-array-overflow.dpatch See CAN-2005-2456
        (See: #321401) (Closes: #321401)
      - netfilter-ip_conntrack_untracked-refcount.dpatch
      - sys_get_thread_area-leak.dpatch
@@ -157,8 +157,12 @@
   * fs_ext2_ext3_xattr-sharing.dpatch
      [Security] Xattr sharing bug
      See http://lists.debian.org/debian-kernel/2005/08/msg00238.html
+  * vlan-mii-ioctl.dpatch
+     [May Be Security] MII ioctl pass through was passing the wrong device.
+     See http://lists.osdl.org/pipermail/bridge/2004-September/000638.html
+     (Closes: #309308)
 
- -- Simon Horman <horms at debian.org>  Tue,  9 Aug 2005 18:37:23 +0900
+ -- Simon Horman <horms at debian.org>  Thu, 11 Aug 2005 13:20:15 +0900
 
 kernel-source-2.6.8 (2.6.8-16) unstable; urgency=low
 

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-08-11 02:39:12 UTC (rev 3836)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-08-11 06:18:44 UTC (rev 3837)
@@ -42,3 +42,4 @@
 + rocket_c-fix-ldisc-ref-count.dpatch
 + early-vlan-fix.dpatch
 + fs_ext2_ext3_xattr-sharing.dpatch
++ vlan-mii-ioctl.dpatch

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/vlan-mii-ioctl.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/vlan-mii-ioctl.dpatch	2005-08-11 02:39:12 UTC (rev 3836)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/vlan-mii-ioctl.dpatch	2005-08-11 06:18:44 UTC (rev 3837)
@@ -0,0 +1,44 @@
+Package: kernel-image-2.6.8-2-686-smp
+Followup-For: Bug #309308
+
+Just noticed this bug in the testing-security list. I don't know if the
+below patch has been slurped into the Debian patches for 2.6.8, but the
+error posted looks like the same error I suffered when hitting this bug.
+
+Patch from
+http://lists.osdl.org/pipermail/bridge/2004-September/000638.html
+
+The patch was taken into 2.6.9-rc2, and the bug was in code introduced
+very late in the 2.6.8 cycle. (August 2004 I believe)
+
+--- a/net/8021q/vlan_dev.c	2005-08-11 13:16:22.000000000 +0900
++++ b/net/8021q/vlan_dev.c	2005-08-11 13:16:57.000000000 +0900
+@@ -810,7 +810,7 @@
+ 	case SIOCGMIIREG:
+ 	case SIOCSMIIREG:
+ 		if (real_dev->do_ioctl && netif_device_present(real_dev)) 
+-			err = real_dev->do_ioctl(dev, &ifrr, cmd);
++			err = real_dev->do_ioctl(real_dev, &ifrr, cmd);
+ 		break;
+ 
+ 	case SIOCETHTOOL:
+
+Cut and paste from the web archive, so spacing etc. may be boned.
+But it's a typo-only fix anyway, so easy enough to recreate.
+
+(Rediffed by Horms for Debian)
+
+-- System Information:
+Debian Release: testing/unstable
+  APT prefers unstable
+  APT policy: (990, 'unstable'), (950, 'unstable'), (900, 'experimental')
+Architecture: i386 (i686)
+Shell:  /bin/sh linked to /bin/bash
+Kernel: Linux 2.6.12
+Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
+
+--
+Paul "TBBle" Hampson, Paul.Hampson at Anu.edu.au
+8th year CompSci/Asian Studies student, ANU
+
+Shorter .sig for a more eco-friendly paperless office.