proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 21:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Make prefix length check return error

Browse Source 
Prefix length validation checks should be returning an error
rather than 0. Switch to that and make them error messages.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
This commit is contained in:
Stephen Worley 2018-07-26 15:10:53 -04:00
parent 758297039c
commit e17d9b2dfe
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zebra/if_netlink.c
View File

@ -992,10 +992,10 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
/* Register interface address to the interface. */ /* Register interface address to the interface. */
if (ifa->ifa_family == AF_INET) { if (ifa->ifa_family == AF_INET) {
if (ifa->ifa_prefixlen > IPV4_MAX_BITLEN) { if (ifa->ifa_prefixlen > IPV4_MAX_BITLEN) {
zlog_warn( zlog_err(
"Invalid prefix length: %u received from kernel interface addr change: %u", "Invalid prefix length: %u received from kernel interface addr change: %u",
ifa->ifa_prefixlen, h->nlmsg_type); ifa->ifa_prefixlen, h->nlmsg_type);
return 0; return -1;
} }
if (h->nlmsg_type == RTM_NEWADDR) if (h->nlmsg_type == RTM_NEWADDR)
connected_add_ipv4(ifp, flags, (struct in_addr *)addr, connected_add_ipv4(ifp, flags, (struct in_addr *)addr,
@ -1008,10 +1008,10 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
} }
if (ifa->ifa_family == AF_INET6) { if (ifa->ifa_family == AF_INET6) {
if (ifa->ifa_prefixlen > IPV6_MAX_BITLEN) { if (ifa->ifa_prefixlen > IPV6_MAX_BITLEN) {
zlog_warn( zlog_err(
"Invalid prefix length: %u received from kernel interface addr change: %u", "Invalid prefix length: %u received from kernel interface addr change: %u",
ifa->ifa_prefixlen, h->nlmsg_type); ifa->ifa_prefixlen, h->nlmsg_type);
return 0; return -1;
} }
if (h->nlmsg_type == RTM_NEWADDR) { if (h->nlmsg_type == RTM_NEWADDR) {
/* Only consider valid addresses; we'll not get a /* Only consider valid addresses; we'll not get a

12
zebra/rt_netlink.c
View File

@ -385,10 +385,10 @@ static int netlink_route_change_read_unicast(struct nlmsghdr *h, ns_id_t ns_id,
if (rtm->rtm_family == AF_INET) { if (rtm->rtm_family == AF_INET) {
p.family = AF_INET; p.family = AF_INET;
if (rtm->rtm_dst_len > IPV4_MAX_BITLEN) { if (rtm->rtm_dst_len > IPV4_MAX_BITLEN) {
zlog_warn( zlog_err(
"Invalid destination prefix length: %u received from kernel route change", "Invalid destination prefix length: %u received from kernel route change",
rtm->rtm_dst_len); rtm->rtm_dst_len);
return 0; return -1;
} }
memcpy(&p.u.prefix4, dest, 4); memcpy(&p.u.prefix4, dest, 4);
p.prefixlen = rtm->rtm_dst_len; p.prefixlen = rtm->rtm_dst_len;
@ -399,20 +399,20 @@ static int netlink_route_change_read_unicast(struct nlmsghdr *h, ns_id_t ns_id,
} else if (rtm->rtm_family == AF_INET6) { } else if (rtm->rtm_family == AF_INET6) {
p.family = AF_INET6; p.family = AF_INET6;
if (rtm->rtm_dst_len > IPV6_MAX_BITLEN) { if (rtm->rtm_dst_len > IPV6_MAX_BITLEN) {
zlog_warn( zlog_err(
"Invalid destination prefix length: %u received from kernel route change", "Invalid destination prefix length: %u received from kernel route change",
rtm->rtm_dst_len); rtm->rtm_dst_len);
return 0; return -1;
} }
memcpy(&p.u.prefix6, dest, 16); memcpy(&p.u.prefix6, dest, 16);
p.prefixlen = rtm->rtm_dst_len; p.prefixlen = rtm->rtm_dst_len;
src_p.family = AF_INET6; src_p.family = AF_INET6;
if (rtm->rtm_src_len > IPV6_MAX_BITLEN) { if (rtm->rtm_src_len > IPV6_MAX_BITLEN) {
zlog_warn( zlog_err(
"Invalid source prefix length: %u received from kernel route change", "Invalid source prefix length: %u received from kernel route change",
rtm->rtm_src_len); rtm->rtm_src_len);
return 0; return -1;
} }
memcpy(&src_p.prefix, src, 16); memcpy(&src_p.prefix, src, 16);
src_p.prefixlen = rtm->rtm_src_len; src_p.prefixlen = rtm->rtm_src_len;