From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3639D3B27CF; Thu, 2 Jul 2026 16:33:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783010010; cv=none; b=oppYkdAD4anNOrT+XdXkFpcc0ceVaeS8HzA//al1Yfukc1pSFrrf9uEP13noHJGmdsvpGRCg+NMI/Yh1TeHcgOCIi7xfbMuqLlzAiu5zooYN3+bc44/jOZtNyo6eZmMAFo40LmDxU1JD7FfisUnlMRiP99gpPMfKTbMPyYeOmbU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783010010; c=relaxed/simple; bh=l8Csdz2iG+S6v8CxHrt+CRwht3VTM2pKMd+T+ai0Ckw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZI/magZwmKlkPZ3o2KoA27J+fBxLd/XAfRKcooh/3fZpdYJ/+EvgK71Z2zVJeNeMxQe0VHtAQ159N5P3pp4txgP1yiH//PcaEeSXrtDheeY5VxhDuydTqo8U2Uplu39DvPJAWWkDuD0OJpgMbF07TQ2H1ZmcLC89rSgdwDn1DV8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QaD8G/f5; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="QaD8G/f5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B6CB1F000E9; Thu, 2 Jul 2026 16:33:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1783010009; bh=nWF7sCkb9IsBNXLQ/NofAWSIMVFTIgSQ2PiYGTCUYes=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QaD8G/f5NyYppkH1PTTeHW6N1tj5jRuHbVU5oIxlWA3JV5cvB7vVzGy+REfQES0hv eiO3RCupBtTJWC+UIGcKH7uqTKUv+L2lMDnF+FlRwS7QXuoA79vy05SKNT5gG9SzjP x3rEumQy6Ry6473dRE8lTeIIpjsU67nWU/R1xMaA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Sven Eckelmann , Sasha Levin Subject: [PATCH 6.1 059/129] batman-adv: prevent ELP transmission interval underflow Date: Thu, 2 Jul 2026 18:19:38 +0200 Message-ID: <20260702155113.367808012@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260702155112.163984240@linuxfoundation.org> References: <20260702155112.163984240@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sven Eckelmann commit 5e50d4b8ae3ea622122d3c6a38d7f6fe68dfddca upstream. batadv_v_elp_start_timer() enqeues a delayed work. The time when it starts is randomly chosen between (elp_interval - BATADV_JITTER) and (elp_interval + BATADV_JITTER). The configured elp_interval must therefore be larger or equal to BATADV_JITTER to avoid that it causes an underflow of the unsigned integer. If this would happen, then a "fast" ELP interval would turn into a "day long" delay. At the same time, it must not be larger than the maximum value the variable can store. Cc: stable@kernel.org Fixes: a10800829040 ("batman-adv: Add elp_interval hardif genl configuration") [ Context ] Signed-off-by: Sven Eckelmann Signed-off-by: Sasha Levin --- net/batman-adv/netlink.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 86e0664e0511bb..7ff48c968a13fe 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -941,9 +941,15 @@ static int batadv_netlink_set_hardif(struct sk_buff *skb, #ifdef CONFIG_BATMAN_ADV_BATMAN_V if (info->attrs[BATADV_ATTR_ELP_INTERVAL]) { + u32 elp_interval; + attr = info->attrs[BATADV_ATTR_ELP_INTERVAL]; + elp_interval = nla_get_u32(attr); + + elp_interval = min_t(u32, elp_interval, INT_MAX); + elp_interval = max_t(u32, elp_interval, BATADV_JITTER); - atomic_set(&hard_iface->bat_v.elp_interval, nla_get_u32(attr)); + atomic_set(&hard_iface->bat_v.elp_interval, elp_interval); } if (info->attrs[BATADV_ATTR_THROUGHPUT_OVERRIDE]) { -- 2.53.0