openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-24 22:26:03 +00:00
Code Issues Projects Releases Wiki Activity

Unlock ICMPV6CTL_ERRPPSLIMIT case of icmp6_sysctl().

Browse Source 
`icmp6errppslim' is the last one of locked `icmpv6ctl_vars'. It is the
integer loaded once within icmp6_ratelimit() which called from two
paths. The first one is icmp6_do_error() which always called in the endo
of error path. The second one is icmp6_redirect_output() where the usage
is similar to already unlocked `ip6_forwarding', except that
icmp6_ratelimit() called only once. So we don't need to cache
`icmp6errppslim' anywhere.

Since icmp6_sysctl() became mp-safe, unlock it too.

ok bluhm.
This commit is contained in:
mvs
2025-10-24 11:51:49 +00:00
parent 782080cb4f
commit ee2f86395c
2 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sys/netinet6/icmp6.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: icmp6.c,v 1.279 2025/09/16 09:19:43 florian Exp $ */
/* $OpenBSD: icmp6.c,v 1.280 2025/10/24 11:51:49 mvs Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -1693,7 +1693,7 @@ icmp6_ratelimit(const struct in6_addr *dst, const int type, const int code)
{
/* PPS limit */
if (!ppsratecheck(&icmp6errppslim_last, &icmp6errpps_count,
icmp6errppslim))
atomic_load_int(&icmp6errppslim)))
return 1; /* The packet is subject to rate limit */
return 0; /* okay to send */
}
@@ -1776,15 +1776,12 @@ icmp6_mtudisc_timeout(struct rtentry *rt, u_int rtableid)
}
#ifndef SMALL_KERNEL
const struct sysctl_bounded_args icmpv6ctl_vars_unlocked[] = {
const struct sysctl_bounded_args icmpv6ctl_vars[] = {
{ ICMPV6CTL_ND6_DELAY, &nd6_delay, 0, INT_MAX },
{ ICMPV6CTL_ND6_UMAXTRIES, &nd6_umaxtries, 0, INT_MAX },
{ ICMPV6CTL_ND6_MMAXTRIES, &nd6_mmaxtries, 0, INT_MAX },
{ ICMPV6CTL_MTUDISC_HIWAT, &icmp6_mtudisc_hiwat, 0, INT_MAX },
{ ICMPV6CTL_MTUDISC_LOWAT, &icmp6_mtudisc_lowat, 0, INT_MAX },
};
const struct sysctl_bounded_args icmpv6ctl_vars[] = {
{ ICMPV6CTL_ERRPPSLIMIT, &icmp6errppslim, -1, 1000 },
};
@@ -1805,12 +1802,6 @@ icmp6_sysctl_icmp6stat(void *oldp, size_t *oldlenp, void *newp)
return (ret);
}
/*
* Temporary, should be replaced with sysctl_lock after icmp6_sysctl()
* unlocking.
*/
struct rwlock icmp6_sysctl_lock = RWLOCK_INITIALIZER("icmp6rwl");
int
icmp6_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
void *newp, size_t newlen)
@@ -1829,11 +1820,11 @@ icmp6_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
error = sysctl_int_bounded(oldp, oldlenp, newp, newlen,
&newval, 0, INT_MAX);
if (error == 0 && oldval != newval) {
rw_enter_write(&icmp6_sysctl_lock);
rw_enter_write(&sysctl_lock);
atomic_store_int(&icmp6_redirtimeout, newval);
rt_timer_queue_change(&icmp6_redirect_timeout_q,
newval);
rw_exit_write(&icmp6_sysctl_lock);
rw_exit_write(&sysctl_lock);
}
return (error);
@@ -1847,22 +1838,10 @@ icmp6_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
atomic_load_int(&ln_hold_total));
break;
case ICMPV6CTL_ND6_DELAY:
case ICMPV6CTL_ND6_UMAXTRIES:
case ICMPV6CTL_ND6_MMAXTRIES:
case ICMPV6CTL_MTUDISC_HIWAT:
case ICMPV6CTL_MTUDISC_LOWAT:
error = sysctl_bounded_arr(icmpv6ctl_vars_unlocked,
nitems(icmpv6ctl_vars_unlocked), name, namelen,
oldp, oldlenp, newp, newlen);
break;
default:
NET_LOCK();
error = sysctl_bounded_arr(icmpv6ctl_vars,
nitems(icmpv6ctl_vars), name, namelen, oldp, oldlenp, newp,
newlen);
NET_UNLOCK();
break;
}

6
sys/netinet6/in6_proto.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: in6_proto.c,v 1.152 2025/09/16 09:19:16 florian Exp $ */
/* $OpenBSD: in6_proto.c,v 1.153 2025/10/24 11:51:49 mvs Exp $ */
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
/*
@@ -169,7 +169,7 @@ const struct protosw inet6sw[] = {
.pr_type = SOCK_RAW,
.pr_domain = &inet6domain,
.pr_protocol = IPPROTO_ICMPV6,
.pr_flags = PR_ATOMIC|PR_ADDR,
.pr_flags = PR_ATOMIC|PR_ADDR|PR_MPSYSCTL,
.pr_input = icmp6_input,
.pr_ctlinput = rip6_ctlinput,
.pr_ctloutput = rip6_ctloutput,
@@ -376,5 +376,5 @@ u_long rip6_recvspace = RIPV6RCVQ;
/* ICMPV6 parameters */
int icmp6_redirtimeout = 10 * 60; /* 10 minutes */
int icmp6errppslim = 100; /* 100pps */
int icmp6errppslim = 100; /* [a] 100pps */
int ip6_mtudisc_timeout = IPMTUDISCTIMEOUT; /* [a] */