From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 29 Dec 2013 02:27:36 +0000 (+0100)
Subject: wireless: fix alignment of wireless config structs - fixes segfaults on arm
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=7d79d0a8aa5a5b4c1ed987af119356438d98fe7b;ds=sidebyside

wireless: fix alignment of wireless config structs - fixes segfaults on arm

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/wireless.c b/wireless.c
index 0fd209e..5313119 100644
--- a/wireless.c
+++ b/wireless.c
@@ -462,10 +462,10 @@ wireless_add_handler(const char *script, const char *name, json_object *obj)
 		return;
 
 	drv = calloc_a(sizeof(*drv),
-		&name_str, strlen(name) + 1,
-		&script_str, strlen(script) + 1,
 		&dev_config, sizeof(*dev_config) + sizeof(void *),
-		&iface_config, sizeof(*iface_config) + sizeof(void *));
+		&iface_config, sizeof(*iface_config) + sizeof(void *),
+		&name_str, strlen(name) + 1,
+		&script_str, strlen(script) + 1);
 
 	drv->name = strcpy(name_str, name);
 	drv->script = strcpy(script_str, script);