xtables-addon: Remove recursive function calls
PATCH 1/1 xtables-addon: Remove recursive function calls
The stack memory is very limited in Linux kernel.
Signed-off-by Changli Gao <[email protected]>
--- extensions/xt_geoip.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-)
extensions/xt_geoip.c +27 -19
@@ -167,16 +167,20 @@ static bool geoip_bsearch6(const struct geoip_subnet6 *range, {int mid; -if (hi <= lo) -return false; - mid = (lo + hi) /2 ; -if (ipv6_cmp (&range[mid].begin, addr) <=0 && -ipv6_cmp (addr, &range[mid].end) <=0 ) -return true; -if (ipv6_cmp (&range[mid].begin, addr) >0 ) -return geoip_bsearch6 (range, addr, lo, mid); -else if (ipv6_cmp (&range[mid].end, addr) <0 ) -return geoip_bsearch6 (range, addr, mid +1 , hi); +while (1 ) { +if (hi <= lo) +return false; + mid = (lo + hi) /2 ; +if (ipv6_cmp (&range[mid].begin, addr) <=0 && +ipv6_cmp (addr, &range[mid].end) <=0 ) +return true; +if (ipv6_cmp (&range[mid].begin, addr) >0 ) + hi = mid; +else if (ipv6_cmp (&range[mid].end, addr) <0 ) + lo = mid +1 ; +else +break ; + }WARN_ON (true);return false;
@@ -218,15 +222,19 @@ static bool geoip_bsearch4(const struct geoip_subnet4 *range, {int mid; -if (hi <= lo) -return false; - mid = (lo + hi) /2 ; -if (range[mid].begin <= addr && addr <= range[mid].end) -return true; -if (range[mid].begin > addr) -return geoip_bsearch4 (range, addr, lo, mid); -else if (range[mid].end < addr) -return geoip_bsearch4 (range, addr, mid +1 , hi); +while (1 ) { +if (hi <= lo) +return false; + mid = (lo + hi) /2 ; +if (range[mid].begin <= addr && addr <= range[mid].end) +return true; +if (range[mid].begin > addr) + hi = mid; +else if (range[mid].end < addr) + lo = mid +1 ; +else +break ; + }WARN_ON (true);return false;
Jan Engelhardt
Appliedextensions/xt_geoip.c
Quoted 10 lines · Changli Gao
The stack memory is very limited in Linux kernel.
Signed-off-by Changli Gao <[email protected]>---
extensions/xt_geoip.c| 46 +++++++++++++++++++++++++++-------------------1 file changed, 27 insertions(+), 19 deletions(-)extensions/xt_geoip.c +0
-0
Thanks, applied.