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 57C9919E98B; Mon, 23 Dec 2024 16:19:32 +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=1734970772; cv=none; b=pu6w4J3xw/kJxw21cTrMzK31VYLLBA4gIVAl6DSVqVih//J8+ilHywF+sRxuK46yfwqQWCb2qqcFZlhVjgBbIvB8KAU7Y80TE36jRvQvGds6n8paeQvoOwpm02dxoWi0+GxyEIgVFrupWeLW5mRkRarNIoW4WpakgK8a1AQOGV4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734970772; c=relaxed/simple; bh=DnlSOZ/biIWdg8qMdTTIZOyUu4kEKxiRvkGcpORB2vw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NF8aZUszzi74AuUba4je2fWtGRHUxoeF078Rz3FXwKDozdP4pES7H7b7Fl/GHVmHKAbFjH1+vqsIqyYyLzZ2BnJWmnAXjslxNAKTjRjMx56AB8Psi/zc/v5rDOhzVuRpmjEX1ZZGlN0lkCGpOTeas329yCDAcJJoaeS+NPx2s7Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mtPVNM9B; 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="mtPVNM9B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD25EC4CED3; Mon, 23 Dec 2024 16:19:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734970772; bh=DnlSOZ/biIWdg8qMdTTIZOyUu4kEKxiRvkGcpORB2vw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mtPVNM9BcngFgcb32mo7AyIc39ljo+fEGOiN+wBXsiV2Euy+SvJpzEFKOnBk6JNTv vvtowooJ1Fb2ZbpHBpL+XorjPe7nG6O+MXSLDTQ9Hu1Zw/3LDoqwFA6bxl6SjaFZuQ WyUjsC47ACkNhJaSw4MvQORSNg71IBHB90zew+3s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Simon Horman , Jakub Kicinski Subject: [PATCH 6.1 34/83] chelsio/chtls: prevent potential integer overflow on 32bit Date: Mon, 23 Dec 2024 16:59:13 +0100 Message-ID: <20241223155354.965583194@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241223155353.641267612@linuxfoundation.org> References: <20241223155353.641267612@linuxfoundation.org> User-Agent: quilt/0.67 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: Dan Carpenter commit fbbd84af6ba70334335bdeba3ae536cf751c14c6 upstream. The "gl->tot_len" variable is controlled by the user. It comes from process_responses(). On 32bit systems, the "gl->tot_len + sizeof(struct cpl_pass_accept_req) + sizeof(struct rss_header)" addition could have an integer wrapping bug. Use size_add() to prevent this. Fixes: a08943947873 ("crypto: chtls - Register chtls with net tls") Cc: stable@vger.kernel.org Signed-off-by: Dan Carpenter Reviewed-by: Simon Horman Link: https://patch.msgid.link/c6bfb23c-2db2-4e1b-b8ab-ba3925c82ef5@stanley.mountain Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c +++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c @@ -346,8 +346,9 @@ static struct sk_buff *copy_gl_to_skb_pk * driver. Once driver synthesizes cpl_pass_accpet_req the skb will go * through the regular cpl_pass_accept_req processing in TOM. */ - skb = alloc_skb(gl->tot_len + sizeof(struct cpl_pass_accept_req) - - pktshift, GFP_ATOMIC); + skb = alloc_skb(size_add(gl->tot_len, + sizeof(struct cpl_pass_accept_req)) - + pktshift, GFP_ATOMIC); if (unlikely(!skb)) return NULL; __skb_put(skb, gl->tot_len + sizeof(struct cpl_pass_accept_req)