mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-27 03:30:09 +01:00
7f05debf99
libcurl does not allow removing easy-handles from within a curl callback. That was already partly avoided for one handle alone. That is, when a handle completed inside a libcurl callback, it would only invoke the callback, but not yet delete it. However, that is not enough, because from within a callback another handle can be cancelled, leading to the removal of (the other) handle and a crash: ==24572== at 0x40319AB: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==24572== by 0x52DDAE5: Curl_close (url.c:392) ==24572== by 0x52EC02C: curl_easy_cleanup (easy.c:825) ==24572== by 0x5FDCD2: cb_data_free (nm-connectivity.c:215) ==24572== by 0x5FF6DE: nm_connectivity_check_cancel (nm-connectivity.c:585) ==24572== by 0x55F7F9: concheck_handle_complete (nm-device.c:2601) ==24572== by 0x574C12: concheck_cb (nm-device.c:2725) ==24572== by 0x5FD887: cb_data_invoke_callback (nm-connectivity.c:167) ==24572== by 0x5FD959: easy_header_cb (nm-connectivity.c:435) ==24572== by 0x52D73CB: chop_write (sendf.c:612) ==24572== by 0x52D73CB: Curl_client_write (sendf.c:668) ==24572== by 0x52D54ED: Curl_http_readwrite_headers (http.c:3904) ==24572== by 0x52E9EA7: readwrite_data (transfer.c:548) ==24572== by 0x52E9EA7: Curl_readwrite (transfer.c:1161) ==24572== by 0x52F4193: multi_runsingle (multi.c:1915) ==24572== by 0x52F5531: multi_socket (multi.c:2607) ==24572== by 0x52F5804: curl_multi_socket_action (multi.c:2771) Fix that, by never invoking any callbacks when we are inside a libcurl callback. Instead, the handle is marked for completion and queued. Later, we complete all queue handles separately. While at it, drop the @error argument from NMConnectivityCheckCallback. It was only used to signal cancellation. Let's instead signal that via status NM_CONNECTIVITY_CANCELLED. https://bugzilla.gnome.org/show_bug.cgi?id=797136 https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1792745 https://bugzilla.opensuse.org/show_bug.cgi?id=1107197 https://github.com/NetworkManager/NetworkManager/pull/207 Fixes:d8a31794c8(cherry picked from commitfa40fc6d76)
67 lines
3.1 KiB
C
67 lines
3.1 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/* NetworkManager -- Network link manager
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright (C) 2011 Thomas Bechtold <thomasbechtold@jpberlin.de>
|
|
* Copyright (C) 2017 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NETWORKMANAGER_CONNECTIVITY_H__
|
|
#define __NETWORKMANAGER_CONNECTIVITY_H__
|
|
|
|
#include "nm-dbus-interface.h"
|
|
|
|
#define NM_CONNECTIVITY_ERROR ((NMConnectivityState) -1)
|
|
#define NM_CONNECTIVITY_FAKE ((NMConnectivityState) -2)
|
|
#define NM_CONNECTIVITY_CANCELLED ((NMConnectivityState) -3)
|
|
#define NM_CONNECTIVITY_DISPOSING ((NMConnectivityState) -4)
|
|
|
|
#define NM_TYPE_CONNECTIVITY (nm_connectivity_get_type ())
|
|
#define NM_CONNECTIVITY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTIVITY, NMConnectivity))
|
|
#define NM_CONNECTIVITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_CONNECTIVITY, NMConnectivityClass))
|
|
#define NM_IS_CONNECTIVITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_CONNECTIVITY))
|
|
#define NM_IS_CONNECTIVITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_CONNECTIVITY))
|
|
#define NM_CONNECTIVITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_CONNECTIVITY, NMConnectivityClass))
|
|
|
|
#define NM_CONNECTIVITY_CONFIG_CHANGED "config-changed"
|
|
|
|
typedef struct _NMConnectivityClass NMConnectivityClass;
|
|
|
|
GType nm_connectivity_get_type (void);
|
|
|
|
NMConnectivity *nm_connectivity_get (void);
|
|
|
|
const char *nm_connectivity_state_to_string (NMConnectivityState state);
|
|
|
|
gboolean nm_connectivity_check_enabled (NMConnectivity *self);
|
|
|
|
guint nm_connectivity_get_interval (NMConnectivity *self);
|
|
|
|
typedef struct _NMConnectivityCheckHandle NMConnectivityCheckHandle;
|
|
|
|
typedef void (*NMConnectivityCheckCallback) (NMConnectivity *self,
|
|
NMConnectivityCheckHandle *handle,
|
|
NMConnectivityState state,
|
|
gpointer user_data);
|
|
|
|
NMConnectivityCheckHandle *nm_connectivity_check_start (NMConnectivity *self,
|
|
const char *iface,
|
|
NMConnectivityCheckCallback callback,
|
|
gpointer user_data);
|
|
|
|
void nm_connectivity_check_cancel (NMConnectivityCheckHandle *handle);
|
|
|
|
#endif /* __NETWORKMANAGER_CONNECTIVITY_H__ */
|