From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 AB8CB296163; Wed, 23 Apr 2025 15:11:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745421089; cv=none; b=MN2k1M3UsVgoxSZYDVLLzb2pG2weXOvKVj6+OtZgsC3SKRmoZswCKfK1iAXDb6pSCxUsyVne9aFvLfLmMDom4pYYfRyPq2+WhGNOlSxspA3AvptoRmmhS21GqeWMw/CinaLh3kXeVSnX8mOLHgp7eQ8vaPpeupaqfsLCyVv0YME= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745421089; c=relaxed/simple; bh=WGgF7U+MoNCdiDbz2mFRXoGg3a6aPY/7mtBwPLELo6U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bXT+RuTKUOnpBba1wpYUZxJXrOIt6Zg81xKqBI9XoFNHu9/mMxL0j55AYmt+F46RmiXlIkbJivApjJw1gSUsQoiQCJ6EphFd11Swfr6PvrRXjAvWIG0Syxo/EHXwMZduTxvNTZ8bxwvjmXIVmFHQ8JiUm04OVeKxzfFZqJYyxgM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tzjDyvVg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tzjDyvVg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1F84C4CEE3; Wed, 23 Apr 2025 15:11:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745421089; bh=WGgF7U+MoNCdiDbz2mFRXoGg3a6aPY/7mtBwPLELo6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tzjDyvVgL3xuHK9SfhGtnUH7MSkwI3LNmdH+XOp63so/nBUsxMTejNtq00rrcwhT+ R1bW0eMVs467PFJEZgWmU8iw1gRZj2XWNNlsTUiVsADMs16iKKMPgoptphkwIMXLkO 25CxFdVU2WDJfPxL4Nd94zXBl+tBZ+DuVQKIJvEg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ilia Gavrilov , Johannes Berg Subject: [PATCH 6.1 107/291] wifi: mac80211: fix integer overflow in hwmp_route_info_get() Date: Wed, 23 Apr 2025 16:41:36 +0200 Message-ID: <20250423142628.742537833@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142624.409452181@linuxfoundation.org> References: <20250423142624.409452181@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Gavrilov Ilia commit d00c0c4105e5ab8a6a13ed23d701cceb285761fa upstream. Since the new_metric and last_hop_metric variables can reach the MAX_METRIC(0xffffffff) value, an integer overflow may occur when multiplying them by 10/9. It can lead to incorrect behavior. Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with SVACE. Fixes: a8d418d9ac25 ("mac80211: mesh: only switch path when new metric is at least 10% better") Cc: stable@vger.kernel.org Signed-off-by: Ilia Gavrilov Link: https://patch.msgid.link/20250212082124.4078236-1-Ilia.Gavrilov@infotecs.ru Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/mesh_hwmp.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -365,6 +365,12 @@ u32 airtime_link_metric_get(struct ieee8 return (u32)result; } +/* Check that the first metric is at least 10% better than the second one */ +static bool is_metric_better(u32 x, u32 y) +{ + return (x < y) && (x < (y - x / 10)); +} + /** * hwmp_route_info_get - Update routing info to originator and transmitter * @@ -455,8 +461,8 @@ static u32 hwmp_route_info_get(struct ie (mpath->sn == orig_sn && (rcu_access_pointer(mpath->next_hop) != sta ? - mult_frac(new_metric, 10, 9) : - new_metric) >= mpath->metric)) { + !is_metric_better(new_metric, mpath->metric) : + new_metric >= mpath->metric))) { process = false; fresh_info = false; } @@ -526,8 +532,8 @@ static u32 hwmp_route_info_get(struct ie if ((mpath->flags & MESH_PATH_FIXED) || ((mpath->flags & MESH_PATH_ACTIVE) && ((rcu_access_pointer(mpath->next_hop) != sta ? - mult_frac(last_hop_metric, 10, 9) : - last_hop_metric) > mpath->metric))) + !is_metric_better(last_hop_metric, mpath->metric) : + last_hop_metric > mpath->metric)))) fresh_info = false; } else { mpath = mesh_path_add(sdata, ta);