summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-05-30 18:12:23 +0200
committerThomas Haller <thaller@redhat.com>2017-05-30 18:17:08 +0200
commit8db2ca661f739a301729bb2c63e5d00707a4f2c3 (patch)
treee4dc2d0710e7f6f234bf7594282f1ccbea1ca0d9
parentb2ab1f4b619907cc088b72c65c436ec250544d16 (diff)
downloadNetworkManager-8db2ca661f739a301729bb2c63e5d00707a4f2c3.tar.gz
libnm: fix rejecting NMSettingVlan with id >= 4095
Without it, clients can wrongly create VLan settings with ID 4095, which triggers assertions in NetworkManager. Fixes: 8715d61437060cacc68c156b1c8ed7bbce4b0a78 (cherry picked from commit 159cd4836fb32f3a6ecefa6fc4dcc114892ce32a)
-rw-r--r--libnm-core/nm-setting-vlan.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
index de9c5c4874..ab1c54651f 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -670,6 +670,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
_("the vlan id must be in range 0-4094 but is %u"),
priv->id);
g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_ID);
+ return FALSE;
}
if (priv->flags & ~NM_VLAN_FLAGS_ALL) {