From 71f60459dbe9f803c0515bd2e54ef18f4e266fa1 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Mon, 9 Jun 2014 16:37:30 -0700 Subject: [PATCH] fix checking of address range bounds, #29514, fallout from #26868 --- httemplate/edit/process/addr_range.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/httemplate/edit/process/addr_range.html b/httemplate/edit/process/addr_range.html index 5df05596e..c236a7353 100644 --- a/httemplate/edit/process/addr_range.html +++ b/httemplate/edit/process/addr_range.html @@ -13,10 +13,13 @@ $cgi->param('end', $end->addr); $cgi->param('start', $start->addr); } - if ( $start + 0x7FFFFFFF <= $end ) { + # detect addr ranges that are too big + my ($one) = split('\.', $start->addr); + if ( $one < 128 and $start + 0x7FFFFFFF <= $end ) { # then this is going to overflow - return "Address ranges must be < 2^31 - 1 addresses long." - } + return "Address ranges must be < 2^31 - 1 addresses long."; + } # if the first octet is >= 128, then it's in the top half of + # address space and it CAN'T be too big $cgi->param('length', $end - $start + 1); } else { -- 2.11.0