mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-31 04:20:11 +01:00
all: merge branch 'th/ubsan-fixes'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/505
This commit is contained in:
commit
01667694ca
12 changed files with 127 additions and 38 deletions
|
|
@ -12,10 +12,15 @@ stages:
|
|||
.fedora_install: &fedora_install
|
||||
before_script:
|
||||
|
||||
# enable EPEL on CentOS
|
||||
- date '+%Y%m%d-%H%M%S'; ! grep -q '^NAME=.*\(CentOS\)' /etc/os-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
|
||||
- date '+%Y%m%d-%H%M%S'; ! ( grep -q '^NAME=.*\(CentOS\)' /etc/os-release && grep -q '^VERSION_ID=.*\<7\>' /etc/os-release ) || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
|
||||
- date '+%Y%m%d-%H%M%S'; ! ( grep -q '^NAME=.*\(CentOS\)' /etc/os-release && grep -q '^VERSION_ID=.*\<7\>' /etc/os-release ) || yum install -y glibc-common
|
||||
- date '+%Y%m%d-%H%M%S'; ! ( grep -q '^NAME=.*\(CentOS\)' /etc/os-release && grep -q '^VERSION_ID=.*\<7\>' /etc/os-release ) || localedef -c -i pl_PL -f UTF-8 pl_PL.UTF-8 && locale -a
|
||||
- date '+%Y%m%d-%H%M%S'; ! ( grep -q '^NAME=.*\(CentOS\)' /etc/os-release && grep -q '^VERSION_ID=.*\<7\>' /etc/os-release ) || yum install -y python36-dbus python36-gobject-base
|
||||
|
||||
- date '+%Y%m%d-%H%M%S'; ! grep -q '^NAME=.*\(CentOS\)' /etc/os-release || (yum install -y glibc-common && localedef -c -i pl_PL -f UTF-8 pl_PL.UTF-8 && locale -a)
|
||||
- date '+%Y%m%d-%H%M%S'; ! ( grep -q '^NAME=.*\(CentOS\)' /etc/os-release && grep -q '^VERSION_ID=.*\<8\>' /etc/os-release ) || dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
|
||||
- date '+%Y%m%d-%H%M%S'; ! ( grep -q '^NAME=.*\(CentOS\)' /etc/os-release && grep -q '^VERSION_ID=.*\<8\>' /etc/os-release ) || dnf install -y 'dnf-command(config-manager)'
|
||||
- date '+%Y%m%d-%H%M%S'; ! ( grep -q '^NAME=.*\(CentOS\)' /etc/os-release && grep -q '^VERSION_ID=.*\<8\>' /etc/os-release ) || dnf config-manager --set-enabled PowerTools
|
||||
- date '+%Y%m%d-%H%M%S'; ! ( grep -q '^NAME=.*\(CentOS\)' /etc/os-release && grep -q '^VERSION_ID=.*\<8\>' /etc/os-release ) || curl https://copr.fedorainfracloud.org/coprs/nmstate/nm-build-deps/repo/epel-8/nmstate-nm-build-deps-epel-8.repo > /etc/yum.repos.d/nmstate-nm-build-deps-epel-8.repo
|
||||
|
||||
- date '+%Y%m%d-%H%M%S'; NM_NO_EXTRA=1 NM_INSTALL="yum install -y" ./contrib/fedora/REQUIRED_PACKAGES
|
||||
- date '+%Y%m%d-%H%M%S'; yum install -y glibc-langpack-pl ccache clang which
|
||||
|
|
@ -24,8 +29,6 @@ stages:
|
|||
# to generate proper documentation.
|
||||
- date '+%Y%m%d-%H%M%S'; yum reinstall -y --setopt='tsflags=' glib2-doc
|
||||
|
||||
- date '+%Y%m%d-%H%M%S'; ! grep -q '^NAME=.*\(CentOS\)' /etc/os-release || yum install -y python36-dbus python36-gobject-base
|
||||
|
||||
- date '+%Y%m%d-%H%M%S'; ! which dnf || dnf install -y python3-dnf-plugins-core
|
||||
- date '+%Y%m%d-%H%M%S'; ! which dnf || dnf debuginfo-install -y glib2
|
||||
- date '+%Y%m%d-%H%M%S'; which dnf || debuginfo-install -y glib2
|
||||
|
|
@ -138,6 +141,24 @@ t_centos:7.6.1810:
|
|||
<<: *do_build
|
||||
when: manual
|
||||
|
||||
t_centos:7.7.1908:
|
||||
<<: *fedora_install
|
||||
image: centos:7.7.1908
|
||||
<<: *do_build
|
||||
when: manual
|
||||
|
||||
t_centos:7.8.2003:
|
||||
<<: *fedora_install
|
||||
image: centos:7.8.2003
|
||||
<<: *do_build
|
||||
when: manual
|
||||
|
||||
t_centos:8.1.1911:
|
||||
<<: *fedora_install
|
||||
image: centos:8.1.1911
|
||||
<<: *do_build
|
||||
when: manual
|
||||
|
||||
t_ubuntu:16.04:
|
||||
<<: *debian_install
|
||||
image: ubuntu:16.04
|
||||
|
|
|
|||
17
Makefile.am
17
Makefile.am
|
|
@ -2391,7 +2391,8 @@ src_NetworkManager_LDADD = \
|
|||
src_NetworkManager_LDFLAGS = \
|
||||
-rdynamic \
|
||||
-Wl,--version-script="src/NetworkManager.ver" \
|
||||
$(SANITIZER_EXEC_LDFLAGS)
|
||||
$(SANITIZER_EXEC_LDFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
$(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
||||
|
||||
|
|
@ -3592,6 +3593,11 @@ check_programs_norun += \
|
|||
src_devices_bluetooth_tests_nm_bt_test_CPPFLAGS = \
|
||||
$(src_cppflags_test) \
|
||||
$(NULL)
|
||||
|
||||
src_devices_bluetooth_tests_nm_bt_test_LDFLAGS = \
|
||||
$(SANITIZER_EXEC_LDFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
src_devices_bluetooth_tests_nm_bt_test_LDADD = \
|
||||
src/devices/bluetooth/libnm-bluetooth-utils.la \
|
||||
src/libNetworkManager.la \
|
||||
|
|
@ -4164,7 +4170,9 @@ dispatcher_nm_dispatcher_SOURCES = \
|
|||
dispatcher_nm_dispatcher_CPPFLAGS = $(dispatcher_cppflags)
|
||||
|
||||
dispatcher_nm_dispatcher_LDFLAGS = \
|
||||
-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
|
||||
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
||||
$(SANITIZER_EXEC_LDFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
dispatcher_nm_dispatcher_LDADD = \
|
||||
dispatcher/libnm-dispatcher-core.la \
|
||||
|
|
@ -4282,7 +4290,9 @@ clients_nm_online_CPPFLAGS = \
|
|||
$(NULL)
|
||||
|
||||
clients_nm_online_LDFLAGS = \
|
||||
-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
|
||||
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
||||
$(SANITIZER_EXEC_LDFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
clients_nm_online_LDADD = \
|
||||
libnm/libnm.la \
|
||||
|
|
@ -5097,6 +5107,7 @@ EXTRA_DIST += \
|
|||
src/ppp/nm-ppp-plugin.ver \
|
||||
Makefile.glib \
|
||||
autogen.sh \
|
||||
lsan.suppressions \
|
||||
valgrind.suppressions \
|
||||
meson.build \
|
||||
meson_options.txt \
|
||||
|
|
|
|||
|
|
@ -963,7 +963,8 @@ nmc_get_devices_sorted (NMClient *client)
|
|||
devs = nm_client_get_devices (client);
|
||||
|
||||
sorted = g_new (NMDevice *, devs->len + 1);
|
||||
memcpy (sorted, devs->pdata, devs->len * sizeof (NMDevice *));
|
||||
if (devs->len > 0)
|
||||
memcpy (sorted, devs->pdata, devs->len * sizeof (NMDevice *));
|
||||
sorted[devs->len] = NULL;
|
||||
|
||||
qsort (sorted, devs->len, sizeof (NMDevice *), compare_devices);
|
||||
|
|
@ -1191,7 +1192,7 @@ fill_output_access_point (gpointer data, gpointer user_data)
|
|||
channel_str = g_strdup_printf ("%u", nm_utils_wifi_freq_to_channel (freq));
|
||||
freq_str = g_strdup_printf (_("%u MHz"), freq);
|
||||
bitrate_str = g_strdup_printf (_("%u Mbit/s"), bitrate/1000);
|
||||
strength_str = g_strdup_printf ("%u", strength);
|
||||
strength_str = nm_strdup_int (strength);
|
||||
wpa_flags_str = ap_wpa_rsn_flags_to_string (wpa_flags, NM_META_ACCESSOR_GET_TYPE_PRETTY);
|
||||
rsn_flags_str = ap_wpa_rsn_flags_to_string (rsn_flags, NM_META_ACCESSOR_GET_TYPE_PRETTY);
|
||||
sig_bars = nmc_wifi_strength_bars (strength);
|
||||
|
|
@ -4577,20 +4578,23 @@ show_device_lldp_list (NMDevice *device, NmCli *nmc, const char *fields_str, int
|
|||
if (nm_lldp_neighbor_get_attr_string_value (neighbor, NM_LLDP_ATTR_SYSTEM_DESCRIPTION, &str))
|
||||
set_val_strc (arr, 6, str);
|
||||
|
||||
if (nm_lldp_neighbor_get_attr_uint_value (neighbor, NM_LLDP_ATTR_SYSTEM_CAPABILITIES, &value))
|
||||
set_val_str (arr, 7, g_strdup_printf ("%u (%s)", value, nmc_parse_lldp_capabilities (value)));
|
||||
if (nm_lldp_neighbor_get_attr_uint_value (neighbor, NM_LLDP_ATTR_SYSTEM_CAPABILITIES, &value)) {
|
||||
gs_free char *tmp = NULL;
|
||||
|
||||
set_val_str (arr, 7, g_strdup_printf ("%u (%s)", value, (tmp = nmc_parse_lldp_capabilities (value))));
|
||||
}
|
||||
|
||||
if (nm_lldp_neighbor_get_attr_uint_value (neighbor, NM_LLDP_ATTR_IEEE_802_1_PVID, &value))
|
||||
set_val_str (arr, 8, g_strdup_printf ("%u", value));
|
||||
set_val_str (arr, 8, nm_strdup_int (value));
|
||||
|
||||
if (nm_lldp_neighbor_get_attr_uint_value (neighbor, NM_LLDP_ATTR_IEEE_802_1_PPVID, &value))
|
||||
set_val_str (arr, 9, g_strdup_printf ("%u", value));
|
||||
set_val_str (arr, 9, nm_strdup_int (value));
|
||||
|
||||
if (nm_lldp_neighbor_get_attr_uint_value (neighbor, NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS, &value))
|
||||
set_val_str (arr, 10, g_strdup_printf ("%u", value));
|
||||
set_val_str (arr, 10, nm_strdup_int (value));
|
||||
|
||||
if (nm_lldp_neighbor_get_attr_uint_value (neighbor, NM_LLDP_ATTR_IEEE_802_1_VID, &value))
|
||||
set_val_str (arr, 11, g_strdup_printf ("%u", value));
|
||||
set_val_str (arr, 11, nm_strdup_int (value));
|
||||
|
||||
if (nm_lldp_neighbor_get_attr_string_value (neighbor, NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME, &str))
|
||||
set_val_strc (arr, 12, str);
|
||||
|
|
@ -4599,10 +4603,10 @@ show_device_lldp_list (NMDevice *device, NmCli *nmc, const char *fields_str, int
|
|||
set_val_strc (arr, 13, str);
|
||||
|
||||
if (nm_lldp_neighbor_get_attr_uint_value (neighbor, NM_LLDP_ATTR_CHASSIS_ID_TYPE, &value))
|
||||
set_val_strc (arr, 14, g_strdup_printf ("%u", value));
|
||||
set_val_str (arr, 14, nm_strdup_int (value));
|
||||
|
||||
if (nm_lldp_neighbor_get_attr_uint_value (neighbor, NM_LLDP_ATTR_PORT_ID_TYPE, &value))
|
||||
set_val_strc (arr, 15, g_strdup_printf ("%u", value));
|
||||
set_val_str (arr, 15, nm_strdup_int (value));
|
||||
|
||||
g_ptr_array_add (out.output_data, arr);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,6 +63,10 @@ ENV_NM_TEST_REGENERATE = 'NM_TEST_REGENERATE'
|
|||
# numbers enabled.
|
||||
ENV_NM_TEST_WITH_LINENO = 'NM_TEST_WITH_LINENO'
|
||||
|
||||
ENV_NM_TEST_ASAN_OPTIONS = 'NM_TEST_ASAN_OPTIONS'
|
||||
ENV_NM_TEST_LSAN_OPTIONS = 'NM_TEST_LSAN_OPTIONS'
|
||||
ENV_NM_TEST_UBSAN_OPTIONS = 'NM_TEST_UBSAN_OPTIONS'
|
||||
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
|
|
@ -406,6 +410,18 @@ class Configuration:
|
|||
v = (os.environ.get(ENV_NM_TEST_REGENERATE, '0') == '1')
|
||||
elif name == ENV_NM_TEST_WITH_LINENO:
|
||||
v = (os.environ.get(ENV_NM_TEST_WITH_LINENO, '0') == '1')
|
||||
elif name in [ ENV_NM_TEST_ASAN_OPTIONS, ENV_NM_TEST_LSAN_OPTIONS, ENV_NM_TEST_UBSAN_OPTIONS ]:
|
||||
v = os.environ.get(name, None)
|
||||
if v is None:
|
||||
if name == ENV_NM_TEST_ASAN_OPTIONS:
|
||||
v = 'detect_leaks=1'
|
||||
#v += ' fast_unwind_on_malloc=false'
|
||||
elif name == ENV_NM_TEST_LSAN_OPTIONS:
|
||||
v = ''
|
||||
elif name == ENV_NM_TEST_UBSAN_OPTIONS:
|
||||
v = 'print_stacktrace=1:halt_on_error=1'
|
||||
else:
|
||||
assert(False)
|
||||
else:
|
||||
raise Exception()
|
||||
self._values[name] = v
|
||||
|
|
@ -763,7 +779,9 @@ class TestNmcli(NmTestBase):
|
|||
env['LIBNM_USE_SESSION_BUS'] = '1'
|
||||
env['LIBNM_USE_NO_UDEV'] = '1'
|
||||
env['TERM'] = 'linux'
|
||||
env['ASAN_OPTIONS'] = 'detect_leaks=0'
|
||||
env['ASAN_OPTIONS'] = conf.get(ENV_NM_TEST_ASAN_OPTIONS)
|
||||
env['LSAN_OPTIONS'] = conf.get(ENV_NM_TEST_LSAN_OPTIONS)
|
||||
env['LBSAN_OPTIONS'] = conf.get(ENV_NM_TEST_UBSAN_OPTIONS)
|
||||
env['XDG_CONFIG_HOME'] = PathConfiguration.srcdir()
|
||||
env['NM_TEST_CALLING_NUM'] = str(calling_num)
|
||||
if fatal_warnings is _DEFAULT_ARG or fatal_warnings:
|
||||
|
|
|
|||
|
|
@ -1137,6 +1137,10 @@ if test "$with_address_sanitizer" = yes -o "$with_address_sanitizer" = "exec"; t
|
|||
else
|
||||
sanitizers="${sanitizers}address(executables-only) "
|
||||
fi
|
||||
elif test "$with_address_sanitizer" = "" -o "$with_address_sanitizer" = no; then
|
||||
with_address_sanitizer=no
|
||||
else
|
||||
AC_MSG_ERROR(["Invalid asan option --with-address-sanitizer=$with_address_sanitizer"])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(undefined-sanitizer,
|
||||
|
|
@ -1152,6 +1156,10 @@ if test "${enable_undefined_sanitizer}" = "yes"; then
|
|||
sanitizer_exec_ldflags="$sanitizer_exec_ldflags -Wc,-fsanitize=undefined"
|
||||
sanitizer_lib_ldflags="$sanitizer_lib_ldflags -Wc,-fsanitize=undefined"
|
||||
sanitizers="${sanitizers}undefined-behavior "
|
||||
elif test "$enable_undefined_sanitizer" = "" -o "$enable_undefined_sanitizer" = no; then
|
||||
enable_undefined_sanitizer=no
|
||||
else
|
||||
AC_MSG_ERROR(["Invalid asan option --enable-undefined-sanitizer=$enable_undefined_sanitizer"])
|
||||
fi
|
||||
|
||||
if test -n "$sanitizers"; then
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ install \
|
|||
jansson-devel \
|
||||
libcurl-devel \
|
||||
libndp-devel \
|
||||
libpsl-devel \
|
||||
libselinux-devel \
|
||||
libtool \
|
||||
libuuid-devel \
|
||||
|
|
@ -73,7 +72,6 @@ install \
|
|||
ppp-devel \
|
||||
python3-dbus \
|
||||
python3-gobject \
|
||||
qt-devel \
|
||||
readline-devel \
|
||||
rpm-build \
|
||||
systemd-devel \
|
||||
|
|
@ -86,7 +84,11 @@ install \
|
|||
|
||||
# some packages don't exist in certain distributions. Install them one-by-one, and ignore errors.
|
||||
install_ignore_missing \
|
||||
python-gobject-base \
|
||||
dbus-python \
|
||||
libasan \
|
||||
libpsl-devel \
|
||||
libubsan \
|
||||
pygobject3-base \
|
||||
python-gobject-base \
|
||||
qt-devel \
|
||||
#end
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ BuildRequires: polkit-devel
|
|||
BuildRequires: jansson-devel
|
||||
%if %{with sanitizer}
|
||||
BuildRequires: libasan
|
||||
%if 0%{?fedora}
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
BuildRequires: libubsan
|
||||
%endif
|
||||
%endif
|
||||
|
|
@ -641,8 +641,10 @@ intltoolize --automake --copy --force
|
|||
%endif
|
||||
%if %{with sanitizer}
|
||||
--with-address-sanitizer=exec \
|
||||
%if 0%{?fedora}
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
--enable-undefined-sanitizer \
|
||||
%else
|
||||
--disable-undefined-sanitizer \
|
||||
%endif
|
||||
%else
|
||||
--with-address-sanitizer=no \
|
||||
|
|
|
|||
|
|
@ -4269,7 +4269,8 @@ nm_utils_hwaddr_matches (gconstpointer hwaddr1,
|
|||
hwaddr1 = buf1;
|
||||
hwaddr1_len = l;
|
||||
} else {
|
||||
g_return_val_if_fail ((hwaddr2_len == -1 && hwaddr2) || (hwaddr2_len > 0 && hwaddr2_len <= NM_UTILS_HWADDR_LEN_MAX), FALSE);
|
||||
g_return_val_if_fail ( hwaddr2_len == -1
|
||||
|| (hwaddr2_len > 0 && hwaddr2_len <= NM_UTILS_HWADDR_LEN_MAX), FALSE);
|
||||
return FALSE;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -4301,9 +4302,17 @@ nm_utils_hwaddr_matches (gconstpointer hwaddr1,
|
|||
}
|
||||
}
|
||||
|
||||
if (G_UNLIKELY ( hwaddr1_len <= 0
|
||||
|| hwaddr1_len > NM_UTILS_HWADDR_LEN_MAX)) {
|
||||
/* Only valid addresses can compare equal. In particular,
|
||||
* addresses that are too long or of zero bytes, never
|
||||
* compare equal. */
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (hwaddr1_len == INFINIBAND_ALEN) {
|
||||
hwaddr1 = (guint8 *)hwaddr1 + INFINIBAND_ALEN - 8;
|
||||
hwaddr2 = (guint8 *)hwaddr2 + INFINIBAND_ALEN - 8;
|
||||
hwaddr1 = &((guint8 *) hwaddr1)[INFINIBAND_ALEN - 8];
|
||||
hwaddr2 = &((guint8 *) hwaddr2)[INFINIBAND_ALEN - 8];
|
||||
hwaddr1_len = 8;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4278,7 +4278,7 @@ test_hwaddr_equal (void)
|
|||
g_assert (nm_utils_hwaddr_matches (null_binary, sizeof (null_binary), null_binary, sizeof (null_binary)));
|
||||
g_assert (nm_utils_hwaddr_matches (null_binary, sizeof (null_binary), NULL, ETH_ALEN));
|
||||
|
||||
g_assert (nm_utils_hwaddr_matches (NULL, -1, NULL, -1));
|
||||
g_assert (!nm_utils_hwaddr_matches (NULL, -1, NULL, -1));
|
||||
g_assert (!nm_utils_hwaddr_matches (NULL, -1, string, -1));
|
||||
g_assert (!nm_utils_hwaddr_matches (string, -1, NULL, -1));
|
||||
g_assert (!nm_utils_hwaddr_matches (NULL, -1, null_string, -1));
|
||||
|
|
|
|||
|
|
@ -2142,8 +2142,8 @@ test_tc_config_qdisc (void)
|
|||
nmtst_assert_success (qdisc1, error);
|
||||
|
||||
g_assert_cmpstr (nm_tc_qdisc_get_kind (qdisc1), ==, "pfifo_fast");
|
||||
g_assert (nm_tc_qdisc_get_handle (qdisc1) == TC_H_MAKE (0x1234 << 16, 0x0000));
|
||||
g_assert (nm_tc_qdisc_get_parent (qdisc1) == TC_H_MAKE (0xfff1 << 16, 0x0001));
|
||||
g_assert (nm_tc_qdisc_get_handle (qdisc1) == TC_H_MAKE (0x1234u << 16, 0x0000u));
|
||||
g_assert (nm_tc_qdisc_get_parent (qdisc1) == TC_H_MAKE (0xfff1u << 16, 0x0001u));
|
||||
|
||||
str = nm_utils_tc_qdisc_to_str (qdisc1, &error);
|
||||
nmtst_assert_success (str, error);
|
||||
|
|
@ -2224,12 +2224,12 @@ test_tc_config_tfilter (void)
|
|||
GError *error = NULL;
|
||||
|
||||
tfilter1 = nm_tc_tfilter_new ("matchall",
|
||||
TC_H_MAKE (0x1234 << 16, 0x0000),
|
||||
TC_H_MAKE (0x1234u << 16, 0x0000u),
|
||||
&error);
|
||||
nmtst_assert_success (tfilter1, error);
|
||||
|
||||
tfilter2 = nm_tc_tfilter_new ("matchall",
|
||||
TC_H_MAKE (0x1234 << 16, 0x0000),
|
||||
TC_H_MAKE (0x1234u << 16, 0x0000u),
|
||||
&error);
|
||||
nmtst_assert_success (tfilter2, error);
|
||||
|
||||
|
|
@ -2283,10 +2283,10 @@ test_tc_config_setting_valid (void)
|
|||
nmtst_assert_success (qdisc1, error);
|
||||
|
||||
qdisc2 = nm_tc_qdisc_new ("pfifo_fast",
|
||||
TC_H_MAKE (0xfff1 << 16, 0x0001),
|
||||
TC_H_MAKE (0xfff1u << 16, 0x0001u),
|
||||
&error);
|
||||
nmtst_assert_success (qdisc2, error);
|
||||
nm_tc_qdisc_set_handle (qdisc2, TC_H_MAKE (0x1234 << 16, 0x0000));
|
||||
nm_tc_qdisc_set_handle (qdisc2, TC_H_MAKE (0x1234u << 16, 0x0000u));
|
||||
|
||||
g_assert (nm_setting_tc_config_get_num_qdiscs (s_tc) == 0);
|
||||
g_assert (nm_setting_tc_config_add_qdisc (s_tc, qdisc1) == TRUE);
|
||||
|
|
@ -2389,16 +2389,16 @@ test_tc_config_dbus (void)
|
|||
|
||||
qdisc1 = nm_tc_qdisc_new ("fq_codel", TC_H_ROOT, &error);
|
||||
nmtst_assert_success (qdisc1, error);
|
||||
nm_tc_qdisc_set_handle (qdisc1, TC_H_MAKE (0x1234 << 16, 0x0000));
|
||||
nm_tc_qdisc_set_handle (qdisc1, TC_H_MAKE (0x1234u << 16, 0x0000u));
|
||||
nm_setting_tc_config_add_qdisc (NM_SETTING_TC_CONFIG (s_tc), qdisc1);
|
||||
|
||||
qdisc2 = nm_tc_qdisc_new ("ingress", TC_H_INGRESS, &error);
|
||||
nmtst_assert_success (qdisc2, error);
|
||||
nm_tc_qdisc_set_handle (qdisc2, TC_H_MAKE (TC_H_INGRESS, 0));
|
||||
nm_tc_qdisc_set_handle (qdisc2, TC_H_MAKE (TC_H_INGRESS, 0u));
|
||||
nm_setting_tc_config_add_qdisc (NM_SETTING_TC_CONFIG (s_tc), qdisc2);
|
||||
|
||||
tfilter1 = nm_tc_tfilter_new ("matchall",
|
||||
TC_H_MAKE (0x1234 << 16, 0x0000),
|
||||
TC_H_MAKE (0x1234u << 16, 0x0000u),
|
||||
&error);
|
||||
nmtst_assert_success (tfilter1, error);
|
||||
action = nm_tc_action_new ("drop", &error);
|
||||
|
|
@ -2409,7 +2409,7 @@ test_tc_config_dbus (void)
|
|||
nm_tc_tfilter_unref (tfilter1);
|
||||
|
||||
tfilter2 = nm_tc_tfilter_new ("matchall",
|
||||
TC_H_MAKE (TC_H_INGRESS, 0),
|
||||
TC_H_MAKE (TC_H_INGRESS, 0u),
|
||||
&error);
|
||||
nmtst_assert_success (tfilter2, error);
|
||||
action = nm_tc_action_new ("simple", &error);
|
||||
|
|
|
|||
1
lsan.suppressions
Normal file
1
lsan.suppressions
Normal file
|
|
@ -0,0 +1 @@
|
|||
leak:OPENSSL_init_crypto
|
||||
|
|
@ -228,6 +228,19 @@ if [[ -n "$BUILDDIR" ]]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
export ASAN_OPTIONS="$NM_TEST_ASAN_OPTIONS"
|
||||
export LSAN_OPTIONS="$NM_TEST_LSAN_OPTIONS"
|
||||
export UBSAN_OPTIONS="$NM_TEST_UBSAN_OPTIONS"
|
||||
if [ -z "${NM_TEST_ASAN_OPTIONS+x}" ]; then
|
||||
ASAN_OPTIONS="fast_unwind_on_malloc=false detect_leaks=1"
|
||||
fi
|
||||
if [ -z "${NM_TEST_LSAN_OPTIONS+x}" ]; then
|
||||
LSAN_OPTIONS="suppressions=$SCRIPT_PATH/../lsan.suppressions"
|
||||
fi
|
||||
if [ -z "${NM_TEST_UBSAN_OPTIONS+x}" ]; then
|
||||
UBSAN_OPTIONS="print_stacktrace=1:halt_on_error=1"
|
||||
fi
|
||||
|
||||
if ! _is_true "$NMTST_USE_VALGRIND" 0; then
|
||||
export NM_TEST_UNDER_VALGRIND=0
|
||||
exec "${NMTST_DBUS_RUN_SESSION[@]}" \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue