mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-21 23:18:00 -08:00
Code

Fix radiusd_ipcp module to check whether the type of the ipcp_address

Browse Source 
is for pool when selecting a random address from the pools, and tweak
the code for easier understanding.  Also,  check whether the left
value of an address range configuration is smaller than the right
value.
This commit is contained in:
yasuoka 2024-11-28 11:51:45 +00:00
parent 1669612dd9
commit 266241f92e
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
usr.sbin/radiusd/radiusd_ipcp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: radiusd_ipcp.c,v 1.20 2024/11/28 10:42:16 yasuoka Exp $ */
/* $OpenBSD: radiusd_ipcp.c,v 1.21 2024/11/28 11:51:45 yasuoka Exp $ */
/*
* Copyright (c) 2024 Internet Initiative Japan Inc.
@ -829,33 +829,39 @@ ipcp_resdeco(void *ctx, u_int q_id, const u_char *req, size_t reqlen,
if (!found)
goto reject;
} else {
int j = 0;
int inpool_idx = 0;
/* select a random address */
n = arc4random_uniform(self->npools);
i = 0;
TAILQ_FOREACH(addr, &self->addrs, next) {
if (addr->type == ADDRESS_TYPE_POOL) {
if (i <= n && n < i + addr->naddrs) {
j = n - i;
inpool_idx = n - i;
break;
}
i += addr->naddrs;
}
}
for (i = 0; i < self->npools; i++, j++) {
if (addr == NULL)
break;
if (j >= addr->naddrs) { /* next pool */
if ((addr = TAILQ_NEXT(addr, next))
== NULL)
addr = TAILQ_FIRST(
&self->addrs);
j = 0;
}
addr4.s_addr = htonl(addr->start.s_addr + j);
/* loop npools times until a free address is found */
for (i = 0; i < self->npools && addr != NULL; i++) {
addr4.s_addr = htonl(
addr->start.s_addr + inpool_idx);
if (ipcp_ipv4_find(self, addr4) == NULL) {
found = true;
break;
}
/* try inpool_idx if it's in the range */
if (++inpool_idx < addr->naddrs)
continue;
/* iterate addr to the next pool */
do {
addr = TAILQ_NEXT(addr, next);
if (addr == NULL)
addr = TAILQ_FIRST(
&self->addrs);
} while (addr->type != ADDRESS_TYPE_POOL);
inpool_idx = 0; /* try the first */
}
if (!found) {
log_info("q=%u user=%s rejected: ran out of "
@ -1819,6 +1825,8 @@ parse_address_range(const char *range)
goto error;
start.s_addr = ntohl(start.s_addr);
end.s_addr = ntohl(end.s_addr);
if (end.s_addr < start.s_addr)
goto error;
} else {
if ((sep = strchr(buf, '/')) != NULL) {
*sep = '\0';