rib: fix traversal with /32 route
PATCH 1/1 rib: fix traversal with /32 route
If a /32 route is entered in the RIB the code to traverse will not see that a a end of the tree. This is due to trying to do a negative shift which is an undefined in C.
Fix by checking for max depth as is already done in rib6.
--- lib/rib/rte_rib.c | 2 ++ 1 file changed, 2 insertions(+)
lib/rib/rte_rib.c +2 -0
@@ -71,6 +71,8 @@ is_covered(uint32_t ip1, uint32_t ip2, uint8_t depth)static inline struct rte_rib_node *get_nxt_node (struct rte_rib_node *node,uint32_t ip) { +if (node->depth ==RIB_MAXDEPTH ) +return NULL ;return (ip & (1 << (31 - node->depth))) ? node->right : node->left; }
Signature · 1 line
2.35.1
Quoted 16 lines · On Thu, 14 Apr 2022 13:01:04 -0700 Stephen Hemminger…
If a /32 route is entered in the RIB the code to traverse will not see that a a end of the tree. This is due to trying to do a negative shift which is an undefined in C.
Fix by checking for max depth as is already done in rib6.
Signed-off-by Stephen Hemminger <[email protected]>--- lib/rib/rte_rib.c | 2 ++ 1 file changed, 2 insertions(+)lib/rib/rte_rib.c +0
-0
lib/rib/rte_rib.c is_covered(uint32_t ip1, uint32_t ip2, uint8_t depth) · line 77
Quoted 7 lines
lib/rib/rte_rib.c +2
-0@@ -71,6 +71,8 @@ is_covered(uint32_t ip1, uint32_t ip2, uint8_t depth)static inline struct rte_rib_node *get_nxt_node (struct rte_rib_node *node,uint32_t ip) { +if (node->depth ==RIB_MAXDEPTH ) +return NULL ;return (ip & (1 << (31 - node->depth))) ? node->right : node->left; }
Quoted 16 lines · Stephen Hemminger
If a /32 route is entered in the RIB the code to traverse will not see that a a end of the tree. This is due to trying to do a negative shift which is an undefined in C.
Fix by checking for max depth as is already done in rib6.
Signed-off-by Stephen Hemminger <[email protected]>--- lib/rib/rte_rib.c | 2 ++ 1 file changed, 2 insertions(+)lib/rib/rte_rib.c +0
-0
lib/rib/rte_rib.c is_covered(uint32_t ip1, uint32_t ip2, uint8_t depth) · line 78
Quoted 8 lines
lib/rib/rte_rib.c +2
-0@@ -71,6 +71,8 @@ is_covered(uint32_t ip1, uint32_t ip2, uint8_t depth)static inline struct rte_rib_node *get_nxt_node (struct rte_rib_node *node,uint32_t ip) { +if (node->depth ==RIB_MAXDEPTH ) +return NULL ;return (ip & (1 << (31 - node->depth))) ? node->right : node->left; }
Signature · 2 lines
Regards, Vladimir
Quoted 29 lines · Vladimir
Quoted 16 lines · Stephen Hemminger
If a /32 route is entered in the RIB the code to traverse will not see that a a end of the tree. This is due to trying to do a negative shift which is an undefined in C.
Fix by checking for max depth as is already done in rib6.
Signed-off-by Stephen Hemminger <[email protected]>---
lib/rib/rte_rib.c| 2 ++1 file changed, 2 insertions(+)lib/rib/rte_rib.c +0
-0@@ -71,6 +71,8 @@ is_covered(uint32_t ip1, uint32_t ip2, uint8_t depth)Quoted 7 lines
static inline struct
rte_rib_node*
get_nxt_node(struct rte_rib_node *node, uint32_t ip)
{
+ if (node->depth==RIB_MAXDEPTH)
+ return NULL;
return (ip & (1 << (31 -node->depth))) ?node->right:node->left; }
Signature · 2 lines
Regards, Vladimir
Thomas Monjalon
Applied26/04/2022 16:30, Medvedkin, Vladimir:
Quoted 31 lines
Fixes 5a5793a5ffa2 ("rib: add RIB library")Quoted 28 lines · Vladimir
Quoted 16 lines · Stephen Hemminger
If a /32 route is entered in the RIB the code to traverse will not see that a a end of the tree. This is due to trying to do a negative shift which is an undefined in C.
Fix by checking for max depth as is already done in rib6.
Signed-off-by Stephen Hemminger <[email protected]>--- lib/rib/rte_rib.c | 2 ++ 1 file changed, 2 insertions(+)lib/rib/rte_rib.c +0
-0lib/rib/rte_rib.c is_covered(uint32_t ip1, uint32_t ip2, uint8_t depth) · line 77
Quoted 7 lines
lib/rib/rte_rib.c +2
-0@@ -71,6 +71,8 @@ is_covered(uint32_t ip1, uint32_t ip2, uint8_t depth)static inline struct rte_rib_node *get_nxt_node (struct rte_rib_node *node,uint32_t ip) { +if (node->depth ==RIB_MAXDEPTH ) +return NULL ;return (ip & (1 << (31 - node->depth))) ? node->right : node->left; }
Applied, thanks.