[RFC,11/14] config: clamp ra_retranstime

Message ID	20240509223213.97389-12-newtwen+github@gmail.com
State	Changes Requested
Delegated to:	Ansuel Smith
Headers	show Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> From: Paul Donald <newtwen+github@gmail.com> To: OpenWrt Development List <openwrt-devel@lists.openwrt.org> Subject: [RFC PATCH 11/14] config: clamp ra_retranstime Date: Fri, 10 May 2024 00:30:43 +0200 Message-ID: <20240509223213.97389-12-newtwen+github@gmail.com> In-Reply-To: <20240509223213.97389-1-newtwen+github@gmail.com> References: <20240509223213.97389-1-newtwen+github@gmail.com> MIME-Version: 1.0 summary: Content analysis details: (-2.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [newtwen+github(at)gmail.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:231 listed in] [list.dnswl.org] Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org
Series	odhcpd config value clamping \| expand [RFC,00/14] odhcpd config value clamping [RFC,01/14] config: refactor parse_leasetime() - branch amount remains same [RFC,02/14] router: Apply updated values from RFC8319 (updates RFC4861) to RA/ND [RFC,03/14] config: clamp ra_mininterval, ra_maxinterval, ra_lifetime at load time [RFC,04/14] router: refactor calc_ra_lifetime, and define ra_lifetime as uint32_t [RFC,05/14] router: redefine ra_mininterval and ra_maxinterval as uint32_t [RFC,06/14] config: implement RFC4861 AdvValidLifetime (make configurable) [RFC,07/14] config: lease times are all UINT32_MAX; drop double size handling [RFC,08/14] router: clamp prefix valid_lt to interface valid_lifetime [RFC,09/14] config: clamp ra_reachabletime to RFC maximum (instead of complaining) [RFC,10/14] config: clamp ra_hoplimit to maximum (instead of complaining) [RFC,11/14] config: clamp ra_retranstime [RFC,12/14] config: clamp ra_mtu into 1280-65535 range [RFC,13/14] config: clamp dhcpv6_hostid_len [RFC,14/14] config: clamp dhcpv6_pd_min_len

Message ID

20240509223213.97389-12-newtwen+github@gmail.com

State

Changes Requested

Delegated to:

Ansuel Smith

Headers

From: Paul Donald <newtwen+github@gmail.com>
To: OpenWrt Development List <openwrt-devel@lists.openwrt.org>
Subject: [RFC PATCH 11/14] config: clamp ra_retranstime
Date: Fri, 10 May 2024 00:30:43 +0200
Message-ID: <20240509223213.97389-12-newtwen+github@gmail.com>
In-Reply-To: <20240509223213.97389-1-newtwen+github@gmail.com>
References: <20240509223213.97389-1-newtwen+github@gmail.com>
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org>
Errors-To: 
 openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org

Series

odhcpd config value clamping | expand

Comments

Christian Marangi Nov. 16, 2024, 3:14 p.m. UTC | #1

On Fri, May 10, 2024 at 12:30:43AM +0200, Paul Donald wrote:
> From: Paul Donald <newtwen@gmail.com>
> 
> Attempt to be helpful.
> 
> Signed-off-by: Paul Donald <newtwen@gmail.com>
> ---
>  src/config.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/src/config.c b/src/config.c
> index e0f2d80..160d7db 100644
> --- a/src/config.c
> +++ b/src/config.c
> @@ -951,11 +951,10 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
>  	if ((c = tb[IFACE_ATTR_RA_RETRANSTIME])) {
>  		uint32_t ra_retranstime = blobmsg_get_u32(c);
>  
> -		if (ra_retranstime <= 60000)
> -			iface->ra_retranstime = ra_retranstime;
> -		else
> -			syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
> -					iface_attrs[IFACE_ATTR_RA_RETRANSTIME].name, iface->name);
> +		iface->ra_retranstime = (ra_retranstime <= 60000) ? ra_retranstime : 60000;
> +		if (ra_retranstime > 60000)
> +			syslog(LOG_INFO, "Clamped invalid %s value configured for interface '%s' to %d",
> +					iface_attrs[IFACE_ATTR_RA_RETRANSTIME].name, iface->name, iface->ra_retranstime);

Same comments as prev patch.

>  	}
>  
>  	if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) {
> -- 
> 2.44.0
> 
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel

diff --git a/src/config.c b/src/config.c
index e0f2d80..160d7db 100644
--- a/src/config.c
+++ b/src/config.c
@@ -951,11 +951,10 @@  int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 	if ((c = tb[IFACE_ATTR_RA_RETRANSTIME])) {
 		uint32_t ra_retranstime = blobmsg_get_u32(c);
 
-		if (ra_retranstime <= 60000)
-			iface->ra_retranstime = ra_retranstime;
-		else
-			syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
-					iface_attrs[IFACE_ATTR_RA_RETRANSTIME].name, iface->name);
+		iface->ra_retranstime = (ra_retranstime <= 60000) ? ra_retranstime : 60000;
+		if (ra_retranstime > 60000)
+			syslog(LOG_INFO, "Clamped invalid %s value configured for interface '%s' to %d",
+					iface_attrs[IFACE_ATTR_RA_RETRANSTIME].name, iface->name, iface->ra_retranstime);
 	}
 
 	if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) {

[RFC,11/14] config: clamp ra_retranstime

Commit Message

Comments

Patch