Re: [PATCH] (backport) fix usage of deprecated D-Bus functions
Dan Williams <dcbw <at> redhat.com>
2008-03-04 15:05:47 GMT
On Tue, 2008-03-04 at 09:58 -0500, Dan Williams wrote:
> Patch has been in 0.6.x for a while already, and I've been shipping it
> along with 0.5.7 in Fedora 8 and Fedora rawhide for quite a while
> already too. I'm assuming you can't cherry-pick from 0.6.x back to
> stable since you blew away the git repo and reinitialized :)
>
> The purpose of the patch is to get rid of
> dbus_message_iter_get_array_len(), which is deprecated because it
> doesn't work everywhere or the way we expect it. Therefore, instead of
> pre-sizing the arrays, we start with a reasonable size and grow the
> arrays when needed while demarshalling the D-Bus message.
Note that this patch isn't susceptible to the potential use-after-free
issue that I just patched for 0.6.x. I fixed the issue in the patch
below before sending it to the list.
Dan
> --- dbus_dict_helpers.c.array-fix 2006-12-18 12:31:11.000000000 -0500
> +++ dbus_dict_helpers.c 2006-12-20 03:17:08.000000000 -0500
> <at> <at> -629,36 +629,55 <at> <at> dbus_bool_t wpa_dbus_dict_open_read(DBus
> }
>
>
> +#define BYTE_ARRAY_CHUNK_SIZE 34
> +#define BYTE_ARRAY_ITEM_SIZE (sizeof (char))
> +
> static dbus_bool_t _wpa_dbus_dict_entry_get_byte_array(
> - DBusMessageIter *iter, int array_len, int array_type,
> + DBusMessageIter *iter, int array_type,
> struct wpa_dbus_dict_entry *entry)
> {
> - dbus_uint32_t i = 0;
> + dbus_uint32_t count = 0;
> dbus_bool_t success = FALSE;
> - char byte;
> + char * buffer;
>
> - /* Zero-length arrays are valid. */
> - if (array_len == 0) {
> - entry->bytearray_value = NULL;
> - entry->array_type = DBUS_TYPE_BYTE;
> - success = TRUE;
> - goto done;
> - }
> + entry->bytearray_value = NULL;
> + entry->array_type = DBUS_TYPE_BYTE;
>
> - entry->bytearray_value = wpa_zalloc(array_len * sizeof(char));
> - if (!entry->bytearray_value) {
> + buffer = wpa_zalloc(BYTE_ARRAY_ITEM_SIZE * BYTE_ARRAY_CHUNK_SIZE);
> + if (!buffer) {
> perror("_wpa_dbus_dict_entry_get_byte_array[dbus]: out of "
> "memory");
> goto done;
> }
>
> - entry->array_type = DBUS_TYPE_BYTE;
> - entry->array_len = array_len;
> + entry->bytearray_value = buffer;
> + entry->array_len = 0;
> while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_BYTE) {
> + char byte;
> +
> + if ((count % BYTE_ARRAY_CHUNK_SIZE) == 0 && count != 0) {
> + buffer = realloc(buffer, BYTE_ARRAY_ITEM_SIZE * (count + BYTE_ARRAY_CHUNK_SIZE));
> + if (buffer == NULL) {
> + perror("_wpa_dbus_dict_entry_get_byte_array["
> + "dbus] out of memory trying to "
> + "retrieve the string array");
> + goto done;
> + }
> + }
> + entry->bytearray_value = buffer;
> +
> dbus_message_iter_get_basic(iter, &byte);
> - entry->bytearray_value[i++] = byte;
> + entry->bytearray_value[count] = byte;
> + entry->array_len = ++count;
> dbus_message_iter_next(iter);
> }
> +
> + /* Zero-length arrays are valid. */
> + if (entry->array_len == 0) {
> + free(entry->bytearray_value);
> + entry->bytearray_value = NULL;
> + }
> +
> success = TRUE;
>
> done:
> <at> <at> -666,8 +685,11 <at> <at> done:
> }
>
>
> +#define STR_ARRAY_CHUNK_SIZE 8
> +#define STR_ARRAY_ITEM_SIZE (sizeof (char *))
> +
> static dbus_bool_t _wpa_dbus_dict_entry_get_string_array(
> - DBusMessageIter *iter, int array_len, int array_type,
> + DBusMessageIter *iter, int array_type,
> struct wpa_dbus_dict_entry *entry)
> {
> dbus_uint32_t count = 0;
> <at> <at> -677,13 +699,7 <at> <at> static dbus_bool_t _wpa_dbus_dict_entry_
> entry->strarray_value = NULL;
> entry->array_type = DBUS_TYPE_STRING;
>
> - /* Zero-length arrays are valid. */
> - if (array_len == 0) {
> - success = TRUE;
> - goto done;
> - }
> -
> - buffer = wpa_zalloc(sizeof (char *) * 8);
> + buffer = wpa_zalloc(STR_ARRAY_ITEM_SIZE * STR_ARRAY_CHUNK_SIZE);
> if (buffer == NULL) {
> perror("_wpa_dbus_dict_entry_get_string_array[dbus] out of "
> "memory trying to retrieve a string array");
> <at> <at> -696,18 +712,14 <at> <at> static dbus_bool_t _wpa_dbus_dict_entry_
> const char *value;
> char *str;
>
> - if ((count % 8) == 0 && count != 0) {
> - char **tmp;
> - tmp = realloc(buffer, sizeof(char *) * (count + 8));
> - if (tmp == NULL) {
> + if ((count % STR_ARRAY_CHUNK_SIZE) == 0 && count != 0) {
> + buffer = realloc(buffer, STR_ARRAY_ITEM_SIZE * (count + STR_ARRAY_CHUNK_SIZE));
> + if (buffer == NULL) {
> perror("_wpa_dbus_dict_entry_get_string_array["
> "dbus] out of memory trying to "
> "retrieve the string array");
> - free(buffer);
> - buffer = NULL;
> goto done;
> }
> - buffer = tmp;
> }
> entry->strarray_value = buffer;
>
> <at> <at> -723,6 +735,13 <at> <at> static dbus_bool_t _wpa_dbus_dict_entry_
> entry->array_len = ++count;
> dbus_message_iter_next(iter);
> }
> +
> + /* Zero-length arrays are valid. */
> + if (entry->array_len == 0) {
> + free(entry->strarray_value);
> + entry->strarray_value = NULL;
> + }
> +
> success = TRUE;
>
> done:
> <at> <at> -734,7 +753,6 <at> <at> static dbus_bool_t _wpa_dbus_dict_entry_
> DBusMessageIter *iter_dict_val, struct wpa_dbus_dict_entry *entry)
> {
> int array_type = dbus_message_iter_get_element_type(iter_dict_val);
> - int array_len;
> dbus_bool_t success = FALSE;
> DBusMessageIter iter_array;
>
> <at> <at> -743,20 +761,14 <at> <at> static dbus_bool_t _wpa_dbus_dict_entry_
>
> dbus_message_iter_recurse(iter_dict_val, &iter_array);
>
> - array_len = dbus_message_iter_get_array_len(&iter_array);
> - if (array_len < 0)
> - return FALSE;
> -
> switch (array_type) {
> case DBUS_TYPE_BYTE:
> success = _wpa_dbus_dict_entry_get_byte_array(&iter_array,
> - array_len,
> array_type,
> entry);
> break;
> case DBUS_TYPE_STRING:
> success = _wpa_dbus_dict_entry_get_string_array(&iter_array,
> - array_len,
> array_type,
> entry);
> break;
> <at> <at> -943,9 +955,17 <at> <at> void wpa_dbus_dict_entry_clear(struct wp
> break;
> case DBUS_TYPE_ARRAY:
> switch (entry->array_type) {
> - case DBUS_TYPE_BYTE:
> - free(entry->bytearray_value);
> - break;
> + case DBUS_TYPE_BYTE: {
> + free(entry->bytearray_value);
> + break;
> + }
> + case DBUS_TYPE_STRING: {
> + int i;
> + for (i = 0; i < entry->array_len; i++)
> + free (entry->strarray_value[i]);
> + free (entry->strarray_value);
> + break;
> + }
> }
> break;
> }
>
> _______________________________________________
> HostAP mailing list
> HostAP <at> lists.shmoo.com
> http://lists.shmoo.com/mailman/listinfo/hostap
At a guess, problem is Nokia together with madwifi, as WEP (no hostapd)
and WPA exhibit the same connection problem (Nokia outbound ok, inbound
to Nokia fails)
I will try to get some info on the madwifi chat tomorrow.
Still, the problem is most probably caused by the Nokia phones since my
laptop has a reliable and stable connection, so I can only hope the guys
at madwifi know this problem already and know how to solve it.
regards,
sven
Am Sonntag, den 02.03.2008, 21:03 +0900 schrieb Saber Zrelli:
> Hi Sven,
>
> Your problem could be caused by the bridge setup. Have you tried using NAT ?
>
> > hi everyone,
> >
> > we are supposed to roll out about 20 new access points on our first test
> > site in a few days, however, I haven't quite got them working yet.
> > The APs are small Alix mainboards equipped with two Atheros miniPCI
> > cards (madwifi driver). System is minimal Debian stable.
> >
> > bridgeutils version is 1.2
RSS Feed