diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-05-02 20:32:42 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-05-02 15:32:42 -0400 |
| commit | f00ff0de40030ed86e7d78c8c1f77b042b51d38c (patch) | |
| tree | 03a50b922c2b8a8455fce12e5b6fbd4f0a4fa2b4 /src/network | |
| parent | b7674ecd5b456d31c7a459f002ccb995a2daec50 (diff) | |
network: reject bridge port priorities above kernel's max value. (#5877)
Bridge port priority in the kernel can only be between 0 and 63. Therefore
reject values above maximum.
Fixes: #5729
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/networkd-link.h | 2 | ||||
| -rw-r--r-- | src/network/networkd-network-gperf.gperf | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index 39c8430ac3..be5c4f3284 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -33,8 +33,6 @@ #include "list.h" #include "set.h" -#define LINK_BRIDGE_PORT_PRIORITY_INVALID 128 - typedef enum LinkState { LINK_STATE_PENDING, LINK_STATE_ENSLAVING, diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 6c4530fbd4..ee8bd6faf7 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -129,7 +129,7 @@ Bridge.HairPin, config_parse_bool, Bridge.FastLeave, config_parse_bool, 0, offsetof(Network, fast_leave) Bridge.AllowPortToBeRoot, config_parse_bool, 0, offsetof(Network, allow_port_to_be_root) Bridge.UnicastFlood, config_parse_bool, 0, offsetof(Network, unicast_flood) -Bridge.Priority, config_parse_uint16, 0, offsetof(Network, priority) +Bridge.Priority, config_parse_bridge_port_priority, 0, offsetof(Network, priority) BridgeFDB.MACAddress, config_parse_fdb_hwaddr, 0, 0 BridgeFDB.VLANId, config_parse_fdb_vlan_id, 0, 0 BridgeVLAN.PVID, config_parse_brvlan_pvid, 0, 0 |