commit e3b0be17a148bd51c38d142baa12947b9990b634
author Dmitry Shmidt <dimitrysh@google.com> Tue Dec 08 13:43:56 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 08 13:43:56 2009 -0800
tree 83ace9108a8315fb46d95db55e314e8e47c18b0f
parent aea96d8d72b9ced7f60b9de38e2e87e6a4a6125a
parent 6a115696c36f5e76efd18342af10953f5d8da914

am 6a115696: (-s ours) driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)

Merge commit '6a115696c36f5e76efd18342af10953f5d8da914' into eclair-mr2

* commit '6a115696c36f5e76efd18342af10953f5d8da914':
  driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)

os_unix.c

diff --git a/os_unix.c b/os_unix.c
index edb160a..8498b15 100644
--- a/os_unix.c
+++ b/os_unix.c
@@ -181,7 +181,7 @@
 	/* We ignore errors here since errors are normal if we
 	 * are already running as non-root.
 	 */
-	gid_t groups[] = { AID_INET, AID_WIFI, AID_KEYSTORE };
+	gid_t groups[] = { AID_INET, AID_WIFI };
 	setgroups(sizeof(groups)/sizeof(groups[0]), groups);
 
 	prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0);

wpa_ctrl.c

diff --git a/wpa_ctrl.c b/wpa_ctrl.c
index 32866cf..3c61b27 100644
--- a/wpa_ctrl.c
+++ b/wpa_ctrl.c
@@ -140,8 +140,11 @@
 
 void wpa_ctrl_close(struct wpa_ctrl *ctrl)
 {
+	if (ctrl == NULL)
+		return;
 	unlink(ctrl->local.sun_path);
-	close(ctrl->s);
+	if (ctrl->s >= 0)
+		close(ctrl->s);
 	os_free(ctrl);
 }