diff options
| author | Ann Pokora <apokora@juniper.net> | 2022-03-04 11:17:42 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-03-04 11:28:36 (GMT) |
| commit | efe8aad98ce341d98f0431b5bfb665e33593c299 (patch) | |
| tree | 51005a1532320acbba701d5d9fc3fee8425f9e97 | |
| parent | 0688bc631367ceaa79fe3755b9467cd6e30df875 (diff) | |
| download | libnl-efe8aad98ce341d98f0431b5bfb665e33593c299.zip libnl-efe8aad98ce341d98f0431b5bfb665e33593c299.tar.gz libnl-efe8aad98ce341d98f0431b5bfb665e33593c299.tar.bz2 | |
route: remove incorrect nl_addr_valid() from rtnl_route_nh_set_newdst(), etc.
nl_addr_valid() expects an address family as argument, not the length.
It also expects an address in string form, not in binary.
Those checks were wrong. Also, it seems not necessary to validate the
argument, purely based on some criteria of the argument alone. Just set
the provided address.
Drop those checks.
This is relevant for NEWDST and ENCAP_MPLS DST processing.
Fixes: 760d74f99c88 ('route: Add support for MPLS encap')
Fixes: 0a6d27ce90a1 ('route: Add support for MPLS address family')
[thaller@redhat.com: split original patch and rewrite commit message].
| -rw-r--r-- | lib/route/nexthop.c | 8 | ||||
| -rw-r--r-- | lib/route/nh_encap_mpls.c | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/lib/route/nexthop.c b/lib/route/nexthop.c index 6accf0d..6835137 100644 --- a/lib/route/nexthop.c +++ b/lib/route/nexthop.c @@ -344,10 +344,6 @@ int rtnl_route_nh_set_newdst(struct rtnl_nexthop *nh, struct nl_addr *addr) { struct nl_addr *old = nh->rtnh_newdst; - if (!nl_addr_valid(nl_addr_get_binary_addr(addr), - nl_addr_get_len(addr))) - return -NLE_INVAL; - if (addr) { nh->rtnh_newdst = nl_addr_get(addr); nh->ce_mask |= NH_ATTR_NEWDST; @@ -371,10 +367,6 @@ int rtnl_route_nh_set_via(struct rtnl_nexthop *nh, struct nl_addr *addr) { struct nl_addr *old = nh->rtnh_via; - if (!nl_addr_valid(nl_addr_get_binary_addr(addr), - nl_addr_get_len(addr))) - return -NLE_INVAL; - if (addr) { nh->rtnh_via = nl_addr_get(addr); nh->ce_mask |= NH_ATTR_VIA; diff --git a/lib/route/nh_encap_mpls.c b/lib/route/nh_encap_mpls.c index 89972bb..65355a7 100644 --- a/lib/route/nh_encap_mpls.c +++ b/lib/route/nh_encap_mpls.c @@ -108,10 +108,6 @@ int rtnl_route_nh_encap_mpls(struct rtnl_nexthop *nh, if (!addr) return -NLE_INVAL; - if (!nl_addr_valid(nl_addr_get_binary_addr(addr), - nl_addr_get_len(addr))) - return -NLE_INVAL; - rtnh_encap = calloc(1, sizeof(*rtnh_encap)); if (!rtnh_encap) return -NLE_NOMEM; |