Merge lp:~cyphermox/ubuntu/lucid/wpasupplicant/dbus-pkcs11-eapol into lp:ubuntu/lucid/wpasupplicant

[Mathieu Trudel-Lapierre]

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-07 01:11:22 +0000
+++ debian/changelog	2012-01-06 16:58:27 +0000
@@ -1,3 +1,11 @@
+wpasupplicant (0.6.9-3ubuntu3.1) lucid-proposed; urgency=low
+
+  * debian/patches/git_dbus_smartcard_eapol_d719934.patch: cherry-pick a patch
+    from Git to correctly re-initialize pointers in the WPA state machine to
+    avoid crashing when smartcard parameters change over DBUS (LP: #528087)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 06 Jan 2012 11:49:41 -0500
+
 wpasupplicant (0.6.9-3ubuntu3) lucid; urgency=low
 
   * rebuild rest of main for armel armv7/thumb2 optimization;

=== added file 'debian/patches/git_dbus_smartcard_eapol_d719934.patch'
--- debian/patches/git_dbus_smartcard_eapol_d719934.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_dbus_smartcard_eapol_d719934.patch	2012-01-06 16:58:27 +0000
@@ -0,0 +1,41 @@
+From d7199342f0633b5ab147dca5b885530fe32ceaeb Mon Sep 17 00:00:00 2001
+From: David Smith <[e-mail]>
+Date: Wed, 11 Nov 2009 17:46:15 +0200
+Subject: [PATCH 1/1] Reset EAPOL pointer when handling DBus smartcard parameters
+
+Smartcard parameter update via DBus ended up re-initializing the EAPOL
+state machine without updating the pointer inside WPA state machine.
+This can trigger a segfault when EAP layer attempts to use the old
+reference. Fix this by re-initializing the pointer inside WPA state
+machine.
+---
+ wpa_supplicant/ctrl_iface_dbus_handlers.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/wpa_supplicant/ctrl_iface_dbus_handlers.c b/wpa_supplicant/ctrl_iface_dbus_handlers.c
+index 2fd4e23..0e9d4af 100644
+--- a/wpa_supplicant/ctrl_iface_dbus_handlers.c
++++ b/wpa_supplicant/ctrl_iface_dbus_handlers.c
+@@ -27,6 +27,7 @@
+ #include "wpas_glue.h"
+ #include "eapol_supp/eapol_supp_sm.h"
+ #include "wps_supplicant.h"
++#include "wpa.h"
+ 
+ extern int wpa_debug_level;
+ extern int wpa_debug_show_keys;
+@@ -1270,8 +1271,11 @@ DBusMessage * wpas_dbus_iface_set_smartcard_modules(
+ 	wpa_s->conf->pkcs11_module_path = pkcs11_module_path;
+ #endif /* EAP_TLS_OPENSSL */
+ 
++	wpa_sm_set_eapol(wpa_s->wpa, NULL);
+ 	eapol_sm_deinit(wpa_s->eapol);
++	wpa_s->eapol = NULL;
+ 	wpa_supplicant_init_eapol(wpa_s);
++	wpa_sm_set_eapol(wpa_s->wpa, wpa_s->eapol);
+ 
+ 	return wpas_dbus_new_success_reply(message);
+ 
+-- 
+1.7.4-rc1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-03-05 12:45:09 +0000
+++ debian/patches/series	2012-01-06 16:58:27 +0000
@@ -6,3 +6,4 @@
 10_multi_driver.patch
 11_syslog.patch
 12_no_syslog_flood.patch
+git_dbus_smartcard_eapol_d719934.patch