From nobody Sun Feb 8 06:55:50 2026 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D3491F9ED4 for ; Fri, 17 Jan 2025 09:36:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737106581; cv=none; b=ZHSW6eatqYguNdz6OaNlVa0cBEbZ6rANl3tvEh+BlWw+a5poTIBVbNrmWL1nCap1oUQTEY5Dl1MO4Z6Jcfydzw+Dusz2cJUNM8KXt8+TgCHGLqnANZdmbUI8EVDNqfOCoZ9u5k4R83UZsGTqMQ4a6w+6tJ1DOBNFDSxJoG3hnFI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737106581; c=relaxed/simple; bh=H+FhnTGuFT5UOXr7qIHtnGqAh1+qkO7Xh2Yqjl00IFg=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=VNmRSKtbE3jBSj/Q9Byn7CJgIaT7hlcHL22wyj+/08eVJYcBKHcbRB0y1m/DA1M/Q+uFUULO2oJY5FV8sOFBbnQX7a69TZO0KBeTZ4bXjgvFXyEYenvMW/5NFAQ8KXHcVVyxCkYq4gqPgPY37xEFxEC8G0itvReer5VYp0a/BJA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=uQIicy/X; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="uQIicy/X" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-43618283dedso17792945e9.3 for ; Fri, 17 Jan 2025 01:36:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737106577; x=1737711377; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=dirbEAQ7TpkYOTZ9TBmIZ+8lIOorFd5YMgxh1YmdvBI=; b=uQIicy/XGx1/GD+z8/EdsiMlrsn4Ta/gkJhjUNkDZM1mBWK45nSVUMz80CvyTrQGvU vN4edeyWeCV6BujLJn3q82RqSMDPpNdRVd1wUsKJkI9ADcm59S8IuKmjDtZXLDKN9rAI vaxbR0ivrgasOfR88GHZnMZxrib/GNZ4kU8Gdiz7xmzud00RbLYVIyD7UuTvKiVBC4/W KMPmTQl+BeIG50c1cFdjDmcpo6eNTcQciF/Q2iVC2SOemyLAzQCxE82DP2tiPYYmCvPs xGYfosblCD0TS28CpLAEWH3Bkx9ZNU4vK3pUU8Z4uTaxEXF2o+84PidW4Oh3HQ0+IIkp V+7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737106577; x=1737711377; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dirbEAQ7TpkYOTZ9TBmIZ+8lIOorFd5YMgxh1YmdvBI=; b=aFHtYhnyi7MIWoE56B002bIO4XaNYzevkeRzyGSS3/Hr8SMZTLEXvACcaoqX/t+Zg5 aKoD0tyXOB4SCaR58nhmf2K3O72zjsH1t4N9apmGFbi4DK17Gcp7pbW7r1fxjreVqGmf DlR70mz9GfRRqLIbn37eqlH+6Rf4gy3MRw3OFeEg0bJ6bZq7aq5ftJFZB+9zSzhKluEW 2SRJhG0lN7+7PTjWWgLmDaQ60W36GqUDy2LRvJnvmC3jQic2sqWYwb59ROzR7m6aVAdu lxLpzKPmnR0mfXupJgeQHuDMqgPtaZgTS6VK6Yg2E6EQcYyI0g7FAaH4wEddH8Ww7xUS Y8aw== X-Forwarded-Encrypted: i=1; AJvYcCUCAKOJVOfhw1seo10nDUGV9AZcs8/Gs0FWGRX18MFITERx5SmkUGRm78n2yGzFzrHW0CH516ihiEe8LXE=@vger.kernel.org X-Gm-Message-State: AOJu0Yxjq+yuaZo+xA4EsC8x3lutJhOwZOHX5ZqWW+1pDIwIG6dsFNq0 eIguqv3AbD6WzEhAiFKFeLYg6GW5xNpoGEvwCvlTd+gHAXUyuOg3GaqXecqhQWM= X-Gm-Gg: ASbGncsNKHEc40YzR+fJU7jJK9vt4TJDwrMQxyPRxTlOTPiAt1Aod3tnI1LvHh55TCB nHgaHP4S7L1yXfeUGpbJr17g12PUhmpyvFzO9xWy/YX65t7tB9ymZ5P2XLTYPuOR4O/0jgtG4oJ ThHATelVk/k9Olc1K1hcPye+InhABIt35Al4yc0MO6sFuAoUqmaE1CUvow7VfZSRSu4s0b+1wHz tC4vpY2zfA2cdvxYPDJ5KbzP8zjR7jJMeKhnD+ea44BGf0EXRzIU3U3a0ywcQ== X-Google-Smtp-Source: AGHT+IHBC8ZKB6uvv0nxI6PfIPl0cg315iXRGrXvLFhaitipFvwZL0qXSwpAFvCqWeg/C7bXlU5hmQ== X-Received: by 2002:a05:600c:a01:b0:436:ed38:5c7f with SMTP id 5b1f17b1804b1-438913db8b0mr17966025e9.12.1737106577494; Fri, 17 Jan 2025 01:36:17 -0800 (PST) Received: from localhost ([196.207.164.177]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74995f6sm88940665e9.1.2025.01.17.01.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 01:36:16 -0800 (PST) Date: Fri, 17 Jan 2025 12:36:14 +0300 From: Dan Carpenter To: Jon Maloy Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH net-next] tipc: re-order conditions in tipc_crypto_key_rcv() Message-ID: <88aa0d3a-ce5d-4ad2-bd16-324ee1aedba6@stanley.mountain> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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 43c3f1c971b8..c524421ec652 100644 --- a/net/tipc/crypto.c +++ b/net/tipc/crypto.c @@ -2293,8 +2293,8 @@ static bool tipc_crypto_key_rcv(struct tipc_crypto *r= x, struct tipc_msg *hdr) keylen =3D ntohl(*((__be32 *)(data + TIPC_AEAD_ALG_NAME))); =20 /* Verify the supplied size values */ - if (unlikely(size !=3D keylen + sizeof(struct tipc_aead_key) || - keylen > TIPC_AEAD_KEY_SIZE_MAX)) { + if (unlikely(keylen > TIPC_AEAD_KEY_SIZE_MAX || + size !=3D keylen + sizeof(struct tipc_aead_key))) { pr_debug("%s: invalid MSG_CRYPTO key size\n", rx->name); goto exit; } --=20 2.45.2