r185 - in unstable: rt2400/debian rt2400/debian/patches rt2500/debian rt2500/debian/patches rt2570/debian rt2570/debian/patches rt73/debian rt73/debian/patches

Ben Hutchings benh at alioth.debian.org
Sat May 2 09:00:31 UTC 2009


Author: benh
Date: 2009-05-02 21:00:31 +0000 (Sat, 02 May 2009)
New Revision: 185

Removed:
   unstable/rt2400/debian/patches/001_fix_probe_request_overflow.diff
   unstable/rt2500/debian/patches/006_fix_probe_request_overflow.diff
   unstable/rt2500/debian/patches/009_iwe_stream_update.diff
   unstable/rt2570/debian/patches/007_fix_probe_request_overflow.diff
   unstable/rt2570/debian/patches/009_use_kill_pid.diff
   unstable/rt2570/debian/patches/010_iwe_stream_update.diff
   unstable/rt73/debian/patches/003_fix_probe_request_overflow.diff
   unstable/rt73/debian/patches/005_use_kill_pid.diff
   unstable/rt73/debian/patches/006_iwe_stream_update.diff
Modified:
   unstable/rt2400/debian/changelog
   unstable/rt2400/debian/patches/series
   unstable/rt2500/debian/changelog
   unstable/rt2500/debian/patches/series
   unstable/rt2570/debian/changelog
   unstable/rt2570/debian/patches/series
   unstable/rt73/debian/NEWS
   unstable/rt73/debian/changelog
   unstable/rt73/debian/patches/000_if_name.diff
   unstable/rt73/debian/patches/007_fix_max_usb_packet_size.diff
   unstable/rt73/debian/patches/series
Log:
Update for new CVS snapshots


Modified: unstable/rt2400/debian/changelog
===================================================================
--- unstable/rt2400/debian/changelog	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2400/debian/changelog	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,3 +1,10 @@
+rt2400 (1.2.2+cvs20090424-1) unstable; urgency=low
+
+  * New CVS snapshot; the last version from rt2x00.serialmonkey.com
+    - Obsoletes 001_fix_probe_request_overflow.diff
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 02 May 2009 21:15:37 +0100
+
 rt2400 (1.2.2+cvs20080623-4) unstable; urgency=low
 
   * Fix compatibility with kernel versions 2.6.27-2.6.29

Deleted: unstable/rt2400/debian/patches/001_fix_probe_request_overflow.diff
===================================================================
--- unstable/rt2400/debian/patches/001_fix_probe_request_overflow.diff	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2400/debian/patches/001_fix_probe_request_overflow.diff	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,14 +0,0 @@
-Fix buffer overflow vulnerability in processing of ad-hoc probe
-requests (CVE-2009-0282) (closes: bug#512999)
-
---- rt2400.orig/Module/sanity.c
-+++ rt2400/Module/sanity.c
-@@ -389,7 +389,7 @@
- 
-     COPY_MAC_ADDR(Addr2, &Fr->Hdr.Addr2);
- 
--    if (Fr->Octet[0] != IE_SSID || Fr->Octet[1] > MAX_LEN_OF_SSID)
-+    if (Fr->Octet[0] != IE_SSID || (UCHAR)Fr->Octet[1] > MAX_LEN_OF_SSID)
-     {
-         DBGPRINT(RT_DEBUG_TRACE, "PeerProbeReqSanity fail - wrong SSID IE\n");
-         return FALSE;

Modified: unstable/rt2400/debian/patches/series
===================================================================
--- unstable/rt2400/debian/patches/series	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2400/debian/patches/series	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,4 +1,3 @@
 000_if_name.diff
-001_fix_probe_request_overflow.diff
 002_no_config_file.diff
 003_use_netdev_functions.diff

Modified: unstable/rt2500/debian/changelog
===================================================================
--- unstable/rt2500/debian/changelog	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2500/debian/changelog	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,3 +1,11 @@
+rt2500 (1:1.1.0-b4+cvs20090424-1) unstable; urgency=low
+
+  * New CVS snapshot; the last version from rt2x00.serialmonkey.com
+    - Obsoletes 006_fix_probe_request_overflow.diff,
+      009_iwe_stream_update.diff
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 02 May 2009 21:16:37 +0100
+
 rt2500 (1:1.1.0-b4+cvs20080623-4) unstable; urgency=low
 
   * Fix compatibility with kernel versions 2.6.27-2.6.29 (closes: bug#509547)

Deleted: unstable/rt2500/debian/patches/006_fix_probe_request_overflow.diff
===================================================================
--- unstable/rt2500/debian/patches/006_fix_probe_request_overflow.diff	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2500/debian/patches/006_fix_probe_request_overflow.diff	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,14 +0,0 @@
-Fixed buffer overflow vulnerability in processing of ad-hoc probe
-requests (CVE-2009-0282) (closes: bug#513000)
-
---- rt2500.orig/Module/sanity.c
-+++ rt2500/Module/sanity.c
-@@ -380,7 +380,7 @@
- 
-     COPY_MAC_ADDR(Addr2, &Fr->Hdr.Addr2);
- 
--    if ((Fr->Octet[0] != IE_SSID) || (Fr->Octet[1] > MAX_LEN_OF_SSID))
-+    if ((Fr->Octet[0] != IE_SSID) || ((UCHAR)Fr->Octet[1] > MAX_LEN_OF_SSID))
-     {
-         DBGPRINT(RT_DEBUG_TRACE, "PeerProbeReqSanity fail - wrong SSID IE(Type=%d,Len=%d)\n",Fr->Octet[0],Fr->Octet[1]);
-         return FALSE;

Deleted: unstable/rt2500/debian/patches/009_iwe_stream_update.diff
===================================================================
--- unstable/rt2500/debian/patches/009_iwe_stream_update.diff	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2500/debian/patches/009_iwe_stream_update.diff	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,82 +0,0 @@
-Pass the extra argument to iwe_stream_add_*() functions required from 2.6.27.
-Define wrapper macros for earlier kernel versions.
-
---- rt2500-1.1.0-b4+cvs20080623.orig/Module/rtmp_info.c
-+++ rt2500-1.1.0-b4+cvs20080623/Module/rtmp_info.c
-@@ -54,6 +54,15 @@
- #define IW_ESSID_MAX_SIZE   32
- #endif
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-+#define iwe_stream_add_event(info, stream, ends, iwe, event_len)	\
-+	iwe_stream_add_event(stream, ends, iwe, event_len)
-+#define iwe_stream_add_point(info, stream, ends, iwe, extra)		\
-+	iwe_stream_add_point(stream, ends, iwe, extra)
-+#define iwe_stream_add_value(info, event, value, ends, iwe, event_len)	\
-+	iwe_stream_add_value(event, value, ends, iwe, event_len)
-+#endif
-+
- #define NR_WEP_KEYS 4
- #define WEP_SMALL_KEY_LEN (40/8)
- #define WEP_LARGE_KEY_LEN (104/8)
-@@ -491,7 +500,7 @@
- 		iwe.cmd = SIOCGIWAP;
- 		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
- 				memcpy(iwe.u.ap_addr.sa_data, &pAdapter->PortCfg.BssTab.BssEntry[i].Bssid, ETH_ALEN);
--			current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
-+			current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
- 		//================================
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = SIOCGIWMODE;
-@@ -509,13 +518,13 @@
- 		}
- 
- 		iwe.len = IW_EV_UINT_LEN;
--		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
-+		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
- 		//================================
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = SIOCGIWESSID;
- 		iwe.u.data.length = pAdapter->PortCfg.BssTab.BssEntry[i].SsidLen;
- 		iwe.u.data.flags = 1;
--		current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
-+		current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
- 		//================================
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = SIOCGIWENCODE;
-@@ -523,7 +532,7 @@
- 			iwe.u.data.flags =IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
- 		else
- 			iwe.u.data.flags = IW_ENCODE_DISABLED;
--		current_ev = iwe_stream_add_point(current_ev, end_buf,&iwe,  pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
-+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,&iwe,  pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
- 
- 		//================================
- 		memset(&iwe, 0, sizeof(iwe));
-@@ -534,7 +543,7 @@
- 		{
- 			iwe.u.bitrate.value = RateIdToMbps[pAdapter->PortCfg.BssTab.BssEntry[i].Rates[i]/2] * 1000000;
- 			iwe.u.bitrate.disabled = 0;
--			current_val = iwe_stream_add_value(current_ev,
-+			current_val = iwe_stream_add_value(info, current_ev,
- 				current_val, end_buf, &iwe,
- 				IW_EV_PARAM_LEN);
- 		}
-@@ -547,7 +556,7 @@
- 			iwe.u.freq.m = pAdapter->PortCfg.BssTab.BssEntry[i].Channel;
- 		iwe.u.freq.e = 0;
- 		iwe.u.freq.i = 0;
--		current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
-+		current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
- 		//================================
- 		memset(&iwe, 0, sizeof(iwe));
-                 iwe.cmd = IWEVQUAL;
-@@ -559,7 +568,7 @@
- 		iwe.u.qual.noise = pAdapter->PortCfg.BssTab.BssEntry[i].Noise;
-                 //iwe.u.qual.noise = (pAdapter->PortCfg.LastR17Value > BBP_R17_DYNAMIC_UP_BOUND) ? BBP_R17_DYNAMIC_UP_BOUND : ((ULONG) pAdapter->PortCfg.LastR17Value);           // // noise level (dBm)
- 
--                current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_QUAL_LEN);
-+                current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_QUAL_LEN);
- 
- 
-                 //================================

Modified: unstable/rt2500/debian/patches/series
===================================================================
--- unstable/rt2500/debian/patches/series	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2500/debian/patches/series	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,6 +1,4 @@
 000_if_name.diff
 005_fix_error_rate_vars.diff
-006_fix_probe_request_overflow.diff
 007_no_config_file.diff
 008_use_netdev_functions.diff
-009_iwe_stream_update.diff

Modified: unstable/rt2570/debian/changelog
===================================================================
--- unstable/rt2570/debian/changelog	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2570/debian/changelog	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,3 +1,11 @@
+rt2570 (1.1.0+cvs20090424-1) unstable; urgency=low
+
+  * New CVS snapshot; the last version from rt2x00.serialmonkey.com
+    - Obsoletes 007_fix_probe_request_overflow.diff, 009_use_kill_pid.diff,
+      010_iwe_stream_update.diff
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 02 May 2009 21:17:20 +0100
+
 rt2570 (1.1.0+cvs20080623-3) unstable; urgency=low
 
   * Fix compatibility with kernel versions 2.6.27-2.6.29

Deleted: unstable/rt2570/debian/patches/007_fix_probe_request_overflow.diff
===================================================================
--- unstable/rt2570/debian/patches/007_fix_probe_request_overflow.diff	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2570/debian/patches/007_fix_probe_request_overflow.diff	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,14 +0,0 @@
-Fixed buffer overflow vulnerability in processing of ad-hoc probe
-requests (CVE-2009-0282) (closes: bug#513001)
-
---- rt2570.orig/Module/sanity.c
-+++ rt2570/Module/sanity.c
-@@ -400,7 +400,7 @@
- 
-     COPY_MAC_ADDR(Addr2, &Fr->Hdr.Addr2);
- 
--    if ((Fr->Octet[0] != IE_SSID) || (Fr->Octet[1] > MAX_LEN_OF_SSID))
-+    if ((Fr->Octet[0] != IE_SSID) || ((UCHAR)Fr->Octet[1] > MAX_LEN_OF_SSID))
-     {
-         DBGPRINT(RT_DEBUG_TRACE, "PeerProbeReqSanity fail - wrong SSID IE(Type=%d,Len=%d)\n",Fr->Octet[0],Fr->Octet[1]);
-         return FALSE;

Deleted: unstable/rt2570/debian/patches/009_use_kill_pid.diff
===================================================================
--- unstable/rt2570/debian/patches/009_use_kill_pid.diff	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2570/debian/patches/009_use_kill_pid.diff	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,24 +0,0 @@
-kill_proc() was un-exported in 2.6.27 and later removed, so reimplement it
-using kill_pid().
-
---- rt2570-1.1.0+cvs20080623.orig/Module/rtusb_init.c
-+++ rt2570-1.1.0+cvs20080623/Module/rtusb_init.c
-@@ -42,6 +42,18 @@
- #define RT2570_USB_ALLOC_URB(iso)	usb_alloc_urb(iso);
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+int kill_proc(pid_t pid, int sig, int priv)
-+{
-+	int ret;
-+
-+	rcu_read_lock();
-+	ret = kill_pid(find_vpid(pid), sig, priv);
-+	rcu_read_unlock();
-+	return ret;
-+}
-+#endif
-+
- USHORT	 BBPRegTable[] = {
- 	0x0302,  // R03
- 	0x0419,  // R04

Deleted: unstable/rt2570/debian/patches/010_iwe_stream_update.diff
===================================================================
--- unstable/rt2570/debian/patches/010_iwe_stream_update.diff	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2570/debian/patches/010_iwe_stream_update.diff	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,73 +0,0 @@
-Pass the extra argument to iwe_stream_add_*() functions required from 2.6.27.
-Define wrapper macro for earlier kernel versions.
-
---- rt2570-1.1.0+cvs20080623.orig/Module/rtusb_info.c
-+++ rt2570-1.1.0+cvs20080623/Module/rtusb_info.c
-@@ -49,6 +49,15 @@
- #define IW_ESSID_MAX_SIZE	32
- #endif
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-+#define iwe_stream_add_event(info, stream, ends, iwe, event_len)	\
-+	iwe_stream_add_event(stream, ends, iwe, event_len)
-+#define iwe_stream_add_point(info, stream, ends, iwe, extra)		\
-+	iwe_stream_add_point(stream, ends, iwe, extra)
-+#define iwe_stream_add_value(info, event, value, ends, iwe, event_len)	\
-+	iwe_stream_add_value(event, value, ends, iwe, event_len)
-+#endif
-+
- extern UCHAR CipherWpa2Template[];
- extern UCHAR CipherWpa2TemplateLen;
- extern UCHAR CipherWpaPskTkip[];
-@@ -647,7 +656,7 @@
- 		iwe.cmd = SIOCGIWAP;
- 		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
- 				memcpy(iwe.u.ap_addr.sa_data, &pAdapter->PortCfg.BssTab.BssEntry[i].Bssid, ETH_ALEN);
--			current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
-+			current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
- 		//================================
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = SIOCGIWMODE;
-@@ -665,13 +674,13 @@
- 		}
- 
- 		iwe.len = IW_EV_UINT_LEN;
--		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
-+		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
- 		//================================
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = SIOCGIWESSID;
- 		iwe.u.data.length = pAdapter->PortCfg.BssTab.BssEntry[i].SsidLen;
- 		iwe.u.data.flags = 1;
--		current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
-+		current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
- 		//================================
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = SIOCGIWENCODE;
-@@ -679,7 +688,7 @@
- 			iwe.u.data.flags =IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
- 		else
- 			iwe.u.data.flags = IW_ENCODE_DISABLED;
--		current_ev = iwe_stream_add_point(current_ev, end_buf,&iwe,  pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
-+		current_ev = iwe_stream_add_point(info, current_ev, end_buf,&iwe,  pAdapter->PortCfg.BssTab.BssEntry[i].Ssid);
- 
- 		//================================
- 		memset(&iwe, 0, sizeof(iwe));
-@@ -690,7 +699,7 @@
- 		{
- 			iwe.u.bitrate.value = RateIdToMbps[pAdapter->PortCfg.BssTab.BssEntry[i].Rates[i]/2] * 1000000;
- 			iwe.u.bitrate.disabled = 0;
--			current_val = iwe_stream_add_value(current_ev,
-+			current_val = iwe_stream_add_value(info, current_ev,
- 				current_val, end_buf, &iwe,
- 				IW_EV_PARAM_LEN);
- 		}
-@@ -703,7 +712,7 @@
- 			iwe.u.freq.m = pAdapter->PortCfg.BssTab.BssEntry[i].Channel;
- 		iwe.u.freq.e = 0;
- 		iwe.u.freq.i = 0;
--		current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
-+		current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
- 		//================================
- 		memset(&iwe, 0, sizeof(iwe));
- 

Modified: unstable/rt2570/debian/patches/series
===================================================================
--- unstable/rt2570/debian/patches/series	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt2570/debian/patches/series	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,7 +1,4 @@
 000_if_name.diff
 005_fix_delays.diff
 006_fix_probe_148f_2573.diff
-007_fix_probe_request_overflow.diff
 008_use_netdev_functions.diff
-009_use_kill_pid.diff
-010_iwe_stream_update.diff

Modified: unstable/rt73/debian/NEWS
===================================================================
--- unstable/rt73/debian/NEWS	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt73/debian/NEWS	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,3 +1,13 @@
+rt73 (1:1:1.0.3.6-cvs20090424-dfsg1-1) unstable; urgency=low
+
+  * rt73 is no longer supported by rt2x00.serialmonkey.com.  We cannot
+    provide much support for it, and recommend that you use the rt73usb
+    driver included with the Linux kernel.
+  * If rt73 works (or used to work) with your card but rt73usb does
+    not, please report a bug against the linux-2.6 package.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 02 May 2009 20:04:55 +0100
+
 rt73 (1:1.0.3.6-cvs20071013-1) unstable; urgency=low
 
   * Switched upstream to http://rt2x00.serialmonkey.com/ enhanced legacy

Modified: unstable/rt73/debian/changelog
===================================================================
--- unstable/rt73/debian/changelog	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt73/debian/changelog	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,3 +1,11 @@
+rt73 (1:1.0.3.6-cvs20090424-dfsg1-1) unstable; urgency=low
+
+  * New CVS snapshot; the last version from rt2x00.serialmonkey.com
+    - Obsoletes 003_fix_probe_request_overflow.diff, 005_use_kill_pid.diff,
+      006_iwe_stream_update.diff
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 02 May 2009 21:19:16 +0100
+
 rt73 (1:1.0.3.6-cvs20080623-dfsg1-4) unstable; urgency=low
 
   * Fix compatibility with kernel versions 2.6.27-2.6.29 (closes: bug#522912)

Modified: unstable/rt73/debian/patches/000_if_name.diff
===================================================================
--- unstable/rt73/debian/patches/000_if_name.diff	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt73/debian/patches/000_if_name.diff	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,6 +1,6 @@
---- rt73.orig/Module/rtmp_main.c
-+++ rt73/Module/rtmp_main.c
-@@ -2225,10 +2225,7 @@
+--- rt73-1.0.3.6-cvs20090424-dfsg1.orig/Module/rtmp_main.c
++++ rt73-1.0.3.6-cvs20090424-dfsg1/Module/rtmp_main.c
+@@ -2125,10 +2125,7 @@
  
  	SET_NETDEV_DEV(netdev, &intf->dev);
  
@@ -12,7 +12,7 @@
          struct  usb_host_interface *iface_desc;
          struct  usb_endpoint_descriptor *endpoint;
  
-@@ -2237,39 +2234,6 @@
+@@ -2137,39 +2134,6 @@
      	else
  			strncpy(pAd->net_dev->name, ifname, IFNAMSIZ);
  
@@ -46,7 +46,7 @@
 -		}
 -
 -		sprintf(pAd->net_dev->name, slot_name, i);
--		DBGPRINT(RT_DEBUG_ERROR, "usb device name %s\n", pAd->net_dev->name);
+-		DBGPRINT(RT_DEBUG_INFO, "usb device name %s\n", pAd->net_dev->name);
 -
 -
          /* get the active interface descriptor */

Deleted: unstable/rt73/debian/patches/003_fix_probe_request_overflow.diff
===================================================================
--- unstable/rt73/debian/patches/003_fix_probe_request_overflow.diff	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt73/debian/patches/003_fix_probe_request_overflow.diff	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,14 +0,0 @@
-Fixed buffer overflow vulnerability in processing of ad-hoc probe
-requests (CVE-2009-0282) (closes: bug#512995)
-
---- rt73.orig/Module/sanity.c
-+++ rt73/Module/sanity.c
-@@ -447,7 +447,7 @@
- 
-     COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2);
- 
--    if ((pFrame->Octet[0] != IE_SSID) || (pFrame->Octet[1] > MAX_LEN_OF_SSID))
-+    if ((pFrame->Octet[0] != IE_SSID) || ((UCHAR)pFrame->Octet[1] > MAX_LEN_OF_SSID))
-     {
-         DBGPRINT(RT_DEBUG_TRACE, "PeerProbeReqSanity fail - wrong SSID IE(Type=%d,Len=%d)\n",pFrame->Octet[0],pFrame->Octet[1]);
-         return FALSE;

Deleted: unstable/rt73/debian/patches/005_use_kill_pid.diff
===================================================================
--- unstable/rt73/debian/patches/005_use_kill_pid.diff	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt73/debian/patches/005_use_kill_pid.diff	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,24 +0,0 @@
-kill_proc() was un-exported in 2.6.27 and later removed, so reimplement it
-using kill_pid().
-
---- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtmp_init.c
-+++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtmp_init.c
-@@ -42,6 +42,18 @@
- #define RT_USB_ALLOC_URB(iso)	usb_alloc_urb(iso);
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+int kill_proc(pid_t pid, int sig, int priv)
-+{
-+	int ret;
-+
-+	rcu_read_lock();
-+	ret = kill_pid(find_vpid(pid), sig, priv);
-+	rcu_read_unlock();
-+	return ret;
-+}
-+#endif
-+
- UCHAR	 BIT8[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
- ULONG	 BIT32[] = {0x00000001, 0x00000002, 0x00000004, 0x00000008,
- 					0x00000010, 0x00000020, 0x00000040, 0x00000080,

Deleted: unstable/rt73/debian/patches/006_iwe_stream_update.diff
===================================================================
--- unstable/rt73/debian/patches/006_iwe_stream_update.diff	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt73/debian/patches/006_iwe_stream_update.diff	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,111 +0,0 @@
-Pass the extra argument to iwe_stream_add_*() functions required from 2.6.27.
-Define wrapper macro for earlier kernel versions.
-
---- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtmp_info.c
-+++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtmp_info.c
-@@ -49,6 +49,15 @@
- #define IW_ESSID_MAX_SIZE	32
- #endif
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-+#define iwe_stream_add_event(info, stream, ends, iwe, event_len)	\
-+	iwe_stream_add_event(stream, ends, iwe, event_len)
-+#define iwe_stream_add_point(info, stream, ends, iwe, extra)		\
-+	iwe_stream_add_point(stream, ends, iwe, extra)
-+#define iwe_stream_add_value(info, event, value, ends, iwe, event_len)	\
-+	iwe_stream_add_value(event, value, ends, iwe, event_len)
-+#endif
-+
- extern UCHAR	CipherWpa2Template[];
- extern UCHAR	CipherWpa2TemplateLen;
- extern UCHAR	CipherWpaPskTkip[];
-@@ -679,7 +688,7 @@
-         memcpy(iwe.u.ap_addr.sa_data, &pAdapter->ScanTab.BssEntry[i].Bssid, ETH_ALEN);
- 
-         previous_ev = current_ev;
--        current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
-+        current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
-         if (current_ev == previous_ev)
-             break;
- 
-@@ -691,7 +700,7 @@
- 		iwe.u.data.flags = 1;
- 
-         previous_ev = current_ev;
--		current_ev = iwe_stream_add_point(current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid);
-+		current_ev = iwe_stream_add_point(info, current_ev,end_buf, &iwe, pAdapter->ScanTab.BssEntry[i].Ssid);
-         if (current_ev == previous_ev)
-             break;
- 
-@@ -714,7 +723,7 @@
- 		iwe.len = IW_EV_UINT_LEN;
- 
-         previous_ev = current_ev;
--		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
-+		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,  IW_EV_UINT_LEN);
-         if (current_ev == previous_ev)
-             break;
- 
-@@ -730,7 +739,7 @@
- 		iwe.u.freq.i = 0;
- 
- 		previous_ev = current_ev;
--		current_ev = iwe_stream_add_event(current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
-+		current_ev = iwe_stream_add_event(info, current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
-         if (current_ev == previous_ev)
-             break;
- 
-@@ -744,7 +753,7 @@
- 			iwe.u.data.flags = IW_ENCODE_DISABLED;
- 
-         previous_ev = current_ev;
--        current_ev = iwe_stream_add_point(current_ev, end_buf,&iwe,  (char *)pAdapter->SharedKey[(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);
-+        current_ev = iwe_stream_add_point(info, current_ev, end_buf,&iwe,  (char *)pAdapter->SharedKey[(iwe.u.data.flags & IW_ENCODE_INDEX)-1].Key);
-         if (current_ev == previous_ev)
-             break;
- 
-@@ -759,7 +768,7 @@
- 		{
- 			iwe.u.bitrate.value = RateIdToMbps[pAdapter->ScanTab.BssEntry[i].SupRate[i]/2] * 1000000;
- 			iwe.u.bitrate.disabled = 0;
--			current_val = iwe_stream_add_value(current_ev,
-+			current_val = iwe_stream_add_value(info, current_ev,
- 				current_val, end_buf, &iwe,
- 				IW_EV_PARAM_LEN);
- 		}
-@@ -814,7 +823,7 @@
- 		}
- 		iwe.u.bitrate.value = max_rate * 500000;
- 		iwe.u.bitrate.disabled = 0;
--		current_val = iwe_stream_add_value(current_ev,
-+		current_val = iwe_stream_add_value(info, current_ev,
- 			current_val, end_buf, &iwe,
- 			IW_EV_PARAM_LEN);
- 		if((current_val-current_ev)>IW_EV_LCP_LEN)
-@@ -830,7 +839,7 @@
- 		if (iwe.u.data.length)
- 		{
- 		    previous_ev = current_ev;
--			current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);
-+			current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
-             if (current_ev == previous_ev)
-                 break;
-         }
-@@ -841,7 +850,7 @@
- 		set_quality(pAdapter, &iwe.u.qual, pAdapter->ScanTab.BssEntry[i].Rssi);
- 
- 		previous_ev = current_ev;
--		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
-+		current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
-         if (current_ev == previous_ev)
-             break;
- 
-@@ -856,7 +865,7 @@
- 		if (iwe.u.data.length)
- 		{
- 		    previous_ev = current_ev;
--			current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom);
-+			current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, custom);
-             if (current_ev == previous_ev)
-                 break;
-         }

Modified: unstable/rt73/debian/patches/007_fix_max_usb_packet_size.diff
===================================================================
--- unstable/rt73/debian/patches/007_fix_max_usb_packet_size.diff	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt73/debian/patches/007_fix_max_usb_packet_size.diff	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,14 +1,26 @@
 Fix lookup of max USB packet size (closes: bug#516519)
 
---- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtmp_main.c
-+++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtmp_main.c
-@@ -2251,7 +2251,8 @@
+--- rt73-1.0.3.6-cvs20090424-dfsg1.orig/Module/rtmp_main.c
++++ rt73-1.0.3.6-cvs20090424-dfsg1/Module/rtmp_main.c
+@@ -2151,19 +2151,8 @@
          endpoint = &iface_desc->endpoint[i].desc;
  
          /* get Max Packet Size from endpoint */
--        pAd->BulkOutMaxPacketSize = (USHORT)endpoint->wMaxPacketSize;
+-        pAd->BulkOutMaxPacketSize = le16_to_cpu(endpoint->wMaxPacketSize);
+-
+-		// Workaround for EDIMAX 7318USg suggested by Ivo in forum
+-		if (pAd->BulkOutMaxPacketSize == 0) {
+-			pAd->BulkOutMaxPacketSize = 1;
+-			DBGPRINT(RT_DEBUG_WARN,
+-					"-  %s: Device reports zero length wMaxPacketSize. "
+-					"Using workaround.\n",
+-					__FUNCTION__);
+-			KPRINT(KERN_WARNING, "Device reports zero length wMaxPacketSize. "
+-					"Using workaround.\n");
+-		}
+-
 +        pAd->BulkOutMaxPacketSize =
-+	    usb_maxpacket(dev, usb_sndbulkpipe(dev, 1), true);
-         DBGPRINT(RT_DEBUG_TRACE, "BulkOutMaxPacketSize  %d\n", pAd->BulkOutMaxPacketSize);
- 
++		usb_maxpacket(dev, usb_sndbulkpipe(dev, 1), true);
+         DBGPRINT(RT_DEBUG_INFO, "BulkOutMaxPacketSize  %d\n",
+ 				pAd->BulkOutMaxPacketSize);
  	}

Modified: unstable/rt73/debian/patches/series
===================================================================
--- unstable/rt73/debian/patches/series	2009-05-02 19:04:31 UTC (rev 184)
+++ unstable/rt73/debian/patches/series	2009-05-02 21:00:31 UTC (rev 185)
@@ -1,8 +1,5 @@
 000_if_name.diff
 001_fix_probe_148f_2573.diff
 002_fix_probe_crash.diff
-003_fix_probe_request_overflow.diff
 004_use_netdev_ml_priv.diff
-005_use_kill_pid.diff
-006_iwe_stream_update.diff
 007_fix_max_usb_packet_size.diff




More information about the Pkg-ralink-commits mailing list