Last commit made on 2019-01-11
Get this branch:
git clone -b fix-duplicated-conns https://git.launchpad.net/~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager
Only Alfonso Sanchez-Beato can upload to this branch. If you are Alfonso Sanchez-Beato please log in for upload directions.

Branch merges

Branch information


Recent commits

c13396f... by Alfonso Sanchez-Beato

core: ignore IPv6 multicast in connection comparison

The default multicast route for IPv6 is set by default in some devices.
This makes comparisons between connections that should be the same to
fail, so they are not merged and unneeded connections appear in the
system. This commit make sure this does not happen. The route is
{ dest = "ff00::", prefix = 8 }. Fixes LP: #1811347.

6173f91... by Thomas Haller

core: ignore host-routes routes when matching generated connection

When we generate the connection in nm_device_generate_connection(), we
add all routes that have rt_source (roundtrip(NM_IP_CONFIG_SOURCE_USER)).
Especially since commit e470e1392242a088573c4fc317b7b5ffaca4df19, this
includes automatically added host-routes to the gateway, added by

Later, during nm_utils_match_connection() this route most not prevent
matching. Either nm_device_generate_connection() should not add it, or
nm_utils_match_connection() should ignore it.

I think adjusting the matching is better, because ip-configs are used
for several things, including exposing routes on D-Bus. We don't want
to hide this route on D-Bus.

Fixes: e470e1392242a088573c4fc317b7b5ffaca4df19


447cbe8... by Thomas Haller

src: only compare network parts of routes in nm_utils_match_connection()

Kernel requires that routes have a host part of zero. For NetworkManager
configuration we allow non-zero host parts (but ignore them). Fix
route_compare() to ignore the host part.

This has only effect during assuming connections. That means, on
restart NM would fail to match a connection with static routes
if it has a non-zero host part. So, the impact is rather small.

(cherry picked from commit 034b7fb51c1d16a4002d2902c60aac05e946bb4f)

0e025e8... by Thomas Haller

core: add nm_utils_ipx_address_clear_host_address() util

159c5d2... by Thomas Haller

core: fix matching routes for assuming connections

If the connection candidate contains a static route
without route-metric, but overrides the default
route-metric, matching would have failed:

  ipv4.route-metric: 200
  ipv4.routes: { ip = }

Then, we must not compare existing routes using the device's
metric, but must use the overwrite from the connection.

06511d9... by Beniamino Galvani <email address hidden>

device: take care of default route of DHCP generated-assumed connections

In general we don't touch the externally set default route on devices
that use a generated-assumed connection. When the IP method is AUTO
(or DHCP), this means that we are not able to restore the default
route after a temporary expiration of the lease which removes
addresses/routes from the device.

Change this, and let NM update the default route for generated-assumed
devices using dynamic addressing.

(cherry picked from commit 9b7f9af0776c5b741c616d3af4b0cda522c27295)

c8196c5... by Beniamino Galvani <email address hidden>

device: don't update applied connection for generated assumed devices

The applied connection must describe the configuration that was
initially activated on the device. Even if the IP configuration
changes, we shouldn't reset the applied connection for devices using a
generated-assumed connection, otherwise we would lose information on
the IP method we're trying on the device.

(cherry picked from commit c84fd50287086082a8037ccb112f99b1026edd17)

d1c241c... by System Enablement CI Bot <email address hidden>

Merge remote tracking branch fix/nm-cve-2018-15688

Merge-Proposal: https://code.launchpad.net/~kzapalowicz/snappy-hwe-snaps/+git/network-manager/+merge/360284

Author: Konrad Zapałowicz <email address hidden>


ef24bab... by Lennart Poettering <email address hidden>

dhcp6: make sure we have enough space for the DHCP6 option header

Fixes a vulnerability originally discovered by Felix Wilhelm from

LP: #1795921

(cherry picked from commit 4dac5eaba4e419b29c97da38a8b1f82336c2c892)
(cherry picked from commit 01ca2053bbea09f35b958c8cc7631e15469acb79)
(cherry picked from commit fc230dca139142f409d7bac99dbfabe9b004e2fb)
(cherry picked from commit cc1e5a7f5731f223d1eb8473fa0eecbedfc0ae5f)
(cherry picked from commit c3221cb0c5b4a2936c198e33b6f7853141991277)
(cherry picked from commit f4f765534191ed3c5d8e78b97333f3fd978a2b63)
(cherry picked from commit 2a25872910606d83f0532d668e73ab4809ee7f90)
(cherry picked from commit ec471872e47f389d88a0dc6a12164feed378de39)

98773dc... by System Enablement CI Bot <email address hidden>

Merge remote tracking branch fix-warning

Merge-Proposal: https://code.launchpad.net/~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager/+merge/354757

Author: Alfonso Sanchez-Beato <email address hidden>

Initialize properly variable in sd-ipv4acd.c

To avoid compiler warning.