On 9/30/25 4:35 PM, Ales Musil wrote: > On Tue, Sep 30, 2025 at 1:22 PM Ales Musil <[email protected]> wrote: > >> >> >> On Tue, Sep 30, 2025 at 10:18 AM Dumitru Ceara via dev < >> [email protected]> wrote: >> >>> We already have the parsed data in 'lrp_networks'. >>> >>> Originally reported under a slightly different form by coverity: >>> ** CID 490187: (CHECKED_RETURN) >>> /northd/northd.c: 11547 in parsed_routes_add_connected() >>> /northd/northd.c: 11535 in parsed_routes_add_connected() >>> >>> CID 490187: (CHECKED_RETURN) >>> >>> Calling "ip46_parse" without checking return value (as is >>> done elsewhere 12 out of 15 times). >>> 11547 ip46_parse(addr->network_s, &prefix); >>> >>> Fixes: f8924740f26e ("northd: Move connected routes to route engine.") >>> Signed-off-by: Dumitru Ceara <[email protected]> >>> --- >>> northd/northd.c | 6 ++---- >>> 1 file changed, 2 insertions(+), 4 deletions(-) >>> >>> diff --git a/northd/northd.c b/northd/northd.c >>> index b49c6d6931..9991d8d326 100644 >>> --- a/northd/northd.c >>> +++ b/northd/northd.c >>> @@ -11532,8 +11532,8 @@ parsed_routes_add_connected(const struct >>> ovn_datapath *od, >>> for (size_t i = 0; i < op->lrp_networks.n_ipv4_addrs; i++) { >>> const struct ipv4_netaddr *addr = >>> &op->lrp_networks.ipv4_addrs[i]; >>> struct in6_addr prefix; >>> - ip46_parse(addr->network_s, &prefix); >>> >>> + in6_addr_set_mapped_ipv4(&prefix, addr->network); >>> parsed_route_add(od, NULL, &prefix, addr->plen, >>> false, addr->addr_s, op, >>> 0, false, >>> @@ -11543,10 +11543,8 @@ parsed_routes_add_connected(const struct >>> ovn_datapath *od, >>> >>> for (size_t i = 0; i < op->lrp_networks.n_ipv6_addrs; i++) { >>> const struct ipv6_netaddr *addr = >>> &op->lrp_networks.ipv6_addrs[i]; >>> - struct in6_addr prefix; >>> - ip46_parse(addr->network_s, &prefix); >>> >>> - parsed_route_add(od, NULL, &prefix, addr->plen, >>> + parsed_route_add(od, NULL, &addr->network, addr->plen, >>> false, addr->addr_s, op, >>> 0, false, >>> false, NULL, ROUTE_SOURCE_CONNECTED, >>> -- >>> 2.51.0 >>> >>> _______________________________________________ >>> dev mailing list >>> [email protected] >>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >>> >>> >> Looks good to me, thanks. >> Acked-by: Ales Musil <[email protected]> >> > > Thank you Dumitru, > > I went ahead and merged this into main and backported down to 25.03. >
Thank you! _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
