From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B676CD3420 for ; Sun, 17 Sep 2023 20:09:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240499AbjIQUJJ (ORCPT ); Sun, 17 Sep 2023 16:09:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240504AbjIQUIw (ORCPT ); Sun, 17 Sep 2023 16:08:52 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3052A100 for ; Sun, 17 Sep 2023 13:08:47 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65CCFC433C7; Sun, 17 Sep 2023 20:08:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1694981326; bh=MHtEpdS8OvvUvzC08lwPLSzCtm0qDifLhxMtuBSQMVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dfje2QqpQW6VYjkQ/rKp4MdGpo6tsMVz8TIMuxlr0ViPcLaK62qIZ5v+uZEohoSAs Rj5rcSgKLEiQJ03Xecy4mMjD0tSGkWS5BSiR6k/OMvtMFrwPv3rtmZbtxP4FZVfvJD EnbUi9rvn/05o3+I9Cx6TQmve/YWPXIHJLjAUv6E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Henrie , David Ahern , "David S. Miller" , Sasha Levin Subject: [PATCH 6.1 105/219] net: ipv6/addrconf: avoid integer underflow in ipv6_create_tempaddr Date: Sun, 17 Sep 2023 21:13:52 +0200 Message-ID: <20230917191044.788127953@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230917191040.964416434@linuxfoundation.org> References: <20230917191040.964416434@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Henrie [ Upstream commit f31867d0d9d82af757c1e0178b659438f4c1ea3c ] The existing code incorrectly casted a negative value (the result of a subtraction) to an unsigned value without checking. For example, if /proc/sys/net/ipv6/conf/*/temp_prefered_lft was set to 1, the preferred lifetime would jump to 4 billion seconds. On my machine and network the shortest lifetime that avoided underflow was 3 seconds. Fixes: 76506a986dc3 ("IPv6: fix DESYNC_FACTOR") Signed-off-by: Alex Henrie Reviewed-by: David Ahern Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv6/addrconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 48a6486951cd6..83be842198244 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1368,7 +1368,7 @@ static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp, bool block) * idev->desync_factor if it's larger */ cnf_temp_preferred_lft = READ_ONCE(idev->cnf.temp_prefered_lft); - max_desync_factor = min_t(__u32, + max_desync_factor = min_t(long, idev->cnf.max_desync_factor, cnf_temp_preferred_lft - regen_advance); -- 2.40.1