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 624FC2165FF; Sun, 26 Jan 2025 15:03:09 +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=1737903789; cv=none; b=gcaJkqCaRz/YbRh61O10k1qBkvQRWMuO2sszs1dfzHg67sdpQfC3RuTaN9iAKNtBBKCNnwXvy9MWnx8UFUdXUAGPZzsy4S6uxnrrE0yb6sPu8oNYwQFEM8hABL+yJ/8PnVMEnUpLl1r7Q0vfO+18M8IdTGihERzS60EYWl+jAws= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737903789; c=relaxed/simple; bh=zSeSfUeMzNK21Yc1cAHQWReLtKedWZhLkCGOUpektQ0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oGOjT3eBi36WxdugUlmBVBLB/RcSBBF8vH6OuBLcbsd5xn8LgBbEk8FwXTs6HEdMahlBdV7TPGFQtKh99DfU+osHdvSZCHy6Ooi7B7kK/zH7YQHnYuc3PmQsUOvfSn5STnnLhMAX/HAjYMflBA/9HSjx1oPTtxYFS0ibDK1fDb0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=J94QluIz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="J94QluIz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7279C4CEE2; Sun, 26 Jan 2025 15:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737903789; bh=zSeSfUeMzNK21Yc1cAHQWReLtKedWZhLkCGOUpektQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J94QluIzx6Wea6MR8OVS/lER2CaPg4r5SKsolGnMFVrmuqZ5+DnZsSdbxVLZAGqT6 skAsxytiQ2YOFKzcs1NMg9VNZQ8hZloUUAE2WKVsAuke8ghjmnr7+9oZqPRavYV192 uYt5fB0y7j3s53lJnqg75g4SZbiCbozkYSvM9wtBw0TPZXjhsFA0XZX93qK/DkTd5/ GVs92siSFq+X0whLELeK1eZ4qt9WEoY+abNh9LGW7oHW/6LlKyXr/iH6py51Uzprzf k4bJLAHmU5AAWx1jP5THw3jCj/l0/DqZI5gqVAAcHZZAKekUQsyCYsKgL5xRQ7+UUT 4lULvKHq386gw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Simon Horman , "David S . Miller" , Sasha Levin , jmaloy@redhat.com, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net Subject: [PATCH AUTOSEL 6.12 27/29] tipc: re-order conditions in tipc_crypto_key_rcv() Date: Sun, 26 Jan 2025 10:02:08 -0500 Message-Id: <20250126150210.955385-27-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250126150210.955385-1-sashal@kernel.org> References: <20250126150210.955385-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.11 Content-Transfer-Encoding: 8bit From: Dan Carpenter [ Upstream commit 5fe71fda89745fc3cd95f70d06e9162b595c3702 ] On a 32bit system the "keylen + sizeof(struct tipc_aead_key)" math could have an integer wrapping issue. It doesn't matter because the "keylen" is checked on the next line, but just to make life easier for static analysis tools, let's re-order these conditions and avoid the integer overflow. Signed-off-by: Dan Carpenter Reviewed-by: Simon Horman Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/tipc/crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c index 43c3f1c971b8f..c524421ec6525 100644 --- a/net/tipc/crypto.c +++ b/net/tipc/crypto.c @@ -2293,8 +2293,8 @@ static bool tipc_crypto_key_rcv(struct tipc_crypto *rx, struct tipc_msg *hdr) keylen = ntohl(*((__be32 *)(data + TIPC_AEAD_ALG_NAME))); /* Verify the supplied size values */ - if (unlikely(size != keylen + sizeof(struct tipc_aead_key) || - keylen > TIPC_AEAD_KEY_SIZE_MAX)) { + if (unlikely(keylen > TIPC_AEAD_KEY_SIZE_MAX || + size != keylen + sizeof(struct tipc_aead_key))) { pr_debug("%s: invalid MSG_CRYPTO key size\n", rx->name); goto exit; } -- 2.39.5