upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-22 15:50:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- For #1040: adjust error text and disallow negative ports in other

Browse source 
parts of cfg_mark_ports.
This commit is contained in:
W.C.A. Wijngaards 2024-04-03 10:16:18 +02:00
parent 103d9a68fa
commit dfff8d23cf
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -1,6 +1,8 @@
3 April 2024: Wouter 3 April 2024: Wouter
- Fix #1040: fix heap-buffer-overflow issue in function cfg_mark_ports - Fix #1040: fix heap-buffer-overflow issue in function cfg_mark_ports
of file util/config_file.c. of file util/config_file.c.
- For #1040: adjust error text and disallow negative ports in other
parts of cfg_mark_ports.
28 March 2024: Wouter 28 March 2024: Wouter
- Fix #1034: DoT forward-zone via unbound-control. - Fix #1034: DoT forward-zone via unbound-control.

14
util/config_file.c
View file

@ -1762,7 +1762,7 @@ cfg_mark_ports(const char* str, int allow, int* avail, int num)
if(!mid) { if(!mid) {
int port = atoi(str); int port = atoi(str);
if(port < 0) { if(port < 0) {
log_err("Prevent out-of-bounds access to array avail"); log_err("port number is negative: %d", port);
return 0; return 0;
} }
if(port == 0 && strcmp(str, "0") != 0) { if(port == 0 && strcmp(str, "0") != 0) {
@ -1774,6 +1774,10 @@ cfg_mark_ports(const char* str, int allow, int* avail, int num)
} else { } else {
int i, low, high = atoi(mid+1); int i, low, high = atoi(mid+1);
char buf[16]; char buf[16];
if(high < 0) {
log_err("port number is negative: %d", high);
return 0;
}
if(high == 0 && strcmp(mid+1, "0") != 0) { if(high == 0 && strcmp(mid+1, "0") != 0) {
log_err("cannot parse port number '%s'", mid+1); log_err("cannot parse port number '%s'", mid+1);
return 0; return 0;
@ -1786,10 +1790,18 @@ cfg_mark_ports(const char* str, int allow, int* avail, int num)
memcpy(buf, str, (size_t)(mid-str)); memcpy(buf, str, (size_t)(mid-str));
buf[mid-str] = 0; buf[mid-str] = 0;
low = atoi(buf); low = atoi(buf);
if(low < 0) {
log_err("port number is negative: %d", low);
return 0;
}
if(low == 0 && strcmp(buf, "0") != 0) { if(low == 0 && strcmp(buf, "0") != 0) {
log_err("cannot parse port number '%s'", buf); log_err("cannot parse port number '%s'", buf);
return 0; return 0;
} }
if(high > num) {
/* Stop very high values from taking a long time. */
high = num;
}
for(i=low; i<=high; i++) { for(i=low; i<=high; i++) {
if(i < num) if(i < num)
avail[i] = (allow?i:0); avail[i] = (allow?i:0);