From patchwork Mon Feb 5 04:44:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kaher X-Patchwork-Id: 196640 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp712741dyb; Sun, 4 Feb 2024 23:11:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEpNGt/BNgwVj5rwEQfb3+FXgdbMfee/uxfVofpsHtqlAwy/0IVqGOADDXJSTETJxIXF32Y X-Received: by 2002:a05:651c:1a0e:b0:2d0:892e:c4e4 with SMTP id by14-20020a05651c1a0e00b002d0892ec4e4mr6040205ljb.35.1707117096732; Sun, 04 Feb 2024 23:11:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707117096; cv=pass; d=google.com; s=arc-20160816; b=hTz1TGTOKM9nOA5ATfLL2HXnLvWtq3LVgBlNJiwOjDmg8Xp5Uif0ZWzuyslvDdnaCm ecid+oWadJXX3CuTVxW4YvzO+hDxjRmIwg1JH+by/JDEJzxED+k5CsdzPMyRKmmk4ZvW af7Yw16MGXIZvKJlLHmcmKeB1fbINpp7Oa+K1h0+yRLnNzMhG6fniLg11vz/rnCgIeMK wQacyDVFuyDRSYtcN1E4sfBimvOGOefTnIumhYQvZxPNNdm2LTM7GV5yTVHCKC2eebA4 GOwXVrfj0LpF7yyLqhlz4lEuHdrUrZuMB0iQWaoTJFIk7SpTMF+z723z26DmHzvBcOfX rSGw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-id:precedence:message-id:date :subject:cc:to:from:dkim-signature; bh=fFHhMPLHf/PHf1gbdd9RUwHvdq1MmSrUv9OUUxHJPew=; fh=hPmgUy2OeHEWzyQ6CmuARDhRSShiXEo9SlFtEjm5GDY=; b=bfvdpyVn9xlgFeFsixttEqCJ+Gyc7rNDmCSyuuRsydMTEk9ZjEAF/9U3VrajNwCJyk HPe1IxST6jVZGq8tfNbI4Mx0ha3bOw9b557ZliAK4LOV4dB0o5xMgK50rrrscskcmNk1 mrtrnlRh32jVjiBWd2A9F2P4FrwCVjZsUZ395aYnh3MlmRPZIlvYdwfo63RVymnlL8cX WmlGQW3snFjwypafrl3Rue6ZeXv39qNVH5+zW+zgFKQEGhmuuXw7nJlycnE8W7C5EhGR nYdSc4IL7w8dx69Pa0KbLfVNTECS8kBCVp/1jH+o1zqQN2QWS0dUomCP00If7iOoB1E+ OLdw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=WaiputF8; arc=pass (i=1 dkim=pass dkdomain=broadcom.com dmarc=pass fromdomain=broadcom.com); spf=pass (google.com: domain of linux-kernel+bounces-52027-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52027-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com X-Forwarded-Encrypted: i=1; AJvYcCUKVP2uytrHgPm+OtEPhOBBs0FbzrSwbmyt6MQVFJMpnuQB2hJ/ILt62LAoNEfXpJT34gYwytNdhUzyeMLgCcnSZ6iz9Q== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id v18-20020a50d592000000b0055f65890218si3856487edi.234.2024.02.04.23.11.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Feb 2024 23:11:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-52027-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=WaiputF8; arc=pass (i=1 dkim=pass dkdomain=broadcom.com dmarc=pass fromdomain=broadcom.com); spf=pass (google.com: domain of linux-kernel+bounces-52027-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52027-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 457951F225AE for ; Mon, 5 Feb 2024 04:45:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9985DBE4B; Mon, 5 Feb 2024 04:45:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="WaiputF8" Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) (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 DC7AFB64C for ; Mon, 5 Feb 2024 04:45:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707108331; cv=none; b=X2riEqeCZJ5IQtddxsQnrqvgYnIoZhe74vIEyHQOORjbcoMi7EztGHSnvigvB4Ua1fqRAEC1ML8Py2g88iQ6OA2LEX0Ma0DW1KikyFBDlaFGTlKVnq7ZNPTGOvuQpHYo4Sc5hLF1m7mIPOGyiBmORe5OjcSRql3cv61oW3hJHp4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707108331; c=relaxed/simple; bh=C3RFITXrVbMMXRyWOgvAlGjMpXLEn7kRJ/T5LQ+Dwo0=; h=From:To:Cc:Subject:Date:Message-Id; b=YRs+iYWvw2M6xPgC90P3qAR+eVhsNba0lt5CX4bwrTi7Quxd705nINXH6A5pKDivO6DvZWo8K5tp591POwHZXUvA0WnqyvcCqzPUHN8oJ7IbpFcaCzWONkel1NZEpcEzddGey6JvKgL5xTIUwLI5dtdO/K2nAo4kfHqSVR866ag= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=WaiputF8; arc=none smtp.client-ip=209.85.210.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-6e12b58a3beso2210099a34.1 for ; Sun, 04 Feb 2024 20:45:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1707108328; x=1707713128; darn=vger.kernel.org; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fFHhMPLHf/PHf1gbdd9RUwHvdq1MmSrUv9OUUxHJPew=; b=WaiputF8vd4U0kfeYN/ht+9dmNVvtoLGkn6tO/aNgNVvBtRt61kLewQ0/y76sW6ozQ KA9K6k3MLDxHn47/PRK+yIGi/lwn1j0q0TolL7cSPZLHsDrGMXi2P1KLIZxg4GKAbTiq sjsopiQe9FdMoQjpHzMSrXZd3U7A/BuvgNBkA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707108328; x=1707713128; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fFHhMPLHf/PHf1gbdd9RUwHvdq1MmSrUv9OUUxHJPew=; b=qNJ6o2GNrzZvOK9uQG4ZFAOVbBdhbasvcbqw/cudzENtrDVNKf3PflD4HrT8ZPFiiF Xro0R9/Zg1IayLMZBIIt442GlLahffsrdki1m8k3GLtmeH24IG8lNDe38NztHQ28XN1p Tvkz/efJ3eGPhpjvFF1479e9XfRPDX+wCsM9W/7BZ9q0J571/9ZVgTlw+Z0yWgg5hXPX lZ5yglDYUQo8kmO50CsKfPFDrSY3wzURjkjJHN2t+JIGrLdqgXR008586VhUmPjvIRQU 1yqF93/oKR1B+u7NWcdPHmgJr6eeAUcwhYDXvrZGq2QCCdx1ldf3Oxt2rIHaAksoF6rg IZeg== X-Gm-Message-State: AOJu0YwFVIGRZ5xODxndmvpbKvgrBKgBuPf8YVgFvTCu4t2JtGtvwGmZ 8PEFyVn+1sLs11Vtzcse8iMWFxqYZJl2atDz/5pJON6Xu+RRR/w22cx7gsEp0w== X-Received: by 2002:a05:6358:6f9c:b0:176:4d01:22af with SMTP id s28-20020a0563586f9c00b001764d0122afmr15640958rwn.4.1707108327825; Sun, 04 Feb 2024 20:45:27 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCWSs66Oq85yGtSLJxv6+8pzpNbVa3ZXxjh/OmBQ2BKZK+SA11XTL8J0LVDMWQBaAhsxtbQZjhkwrZZU6uqBJlVN3CqB3M96uRYUbYwgREloZ8xJ0UBMhP17tepemkj7G3clddifVS60IlEvho6kH/+heAVWvtuU0Yxy89vMaXqWfxp0Poe/9qEmImyduq7WEb9vdaQbYTbVvtnLncsbWzCCjBro3Pdv4LJThOPK2OJbrTWt27Oihzf4YXI1P9QbVCsli/lUMX+lcrtyUdSddk3jWFi9S7EawSmsiRvrImwCX63omLSMvM2N3SiMJgLlDOFqlOuqjcCVvIyUH30jfOTwHOKtHMtKOhqodCSwyekMQkq9XfRDsI9lFEzNN95SUfX83N0u09K2ajrW6KoDE59e0J9ugdrcdSpgxbTf+nP1i8E+NjksQK0SXrEMq2vMSQpsV0mP7qIa2sFDbLvOK3FjlLSR8l1w9vHVn/lFQUj1glLg4RGAy7STvndwRNqN8GFQktdimCeBcxTDsOf328veer2+vfA= Received: from akaher-virtual-machine.eng.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id bn23-20020a056a00325700b006dbda7bcf3csm5629859pfb.83.2024.02.04.20.45.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Feb 2024 20:45:27 -0800 (PST) From: Ajay Kaher To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de, davem@davemloft.net, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alexey.makhalov@broadcom.com, florian.fainelli@broadcom.com, vasavi.sirnapalli@broadcom.com, Ajay Kaher , Dan Carpenter , Sasha Levin Subject: [PATCH v4.19.y] netfilter: nf_tables: fix pointer math issue in nft_byteorder_eval() Date: Mon, 5 Feb 2024 10:14:52 +0530 Message-Id: <1707108293-1004-1-git-send-email-ajay.kaher@broadcom.com> X-Mailer: git-send-email 2.7.4 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790042016940109151 X-GMAIL-MSGID: 1790042016940109151 From: Dan Carpenter commit c301f0981fdd3fd1ffac6836b423c4d7a8e0eb63 upstream. The problem is in nft_byteorder_eval() where we are iterating through a loop and writing to dst[0], dst[1], dst[2] and so on... On each iteration we are writing 8 bytes. But dst[] is an array of u32 so each element only has space for 4 bytes. That means that every iteration overwrites part of the previous element. I spotted this bug while reviewing commit caf3ef7468f7 ("netfilter: nf_tables: prevent OOB access in nft_byteorder_eval") which is a related issue. I think that the reason we have not detected this bug in testing is that most of time we only write one element. Fixes: ce1e7989d989 ("netfilter: nft_byteorder: provide 64bit le/be conversion") Signed-off-by: Dan Carpenter Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin [Ajay: Modified to apply on v4.19.y] Signed-off-by: Ajay Kaher --- net/netfilter/nft_byteorder.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nft_byteorder.c b/net/netfilter/nft_byteorder.c index dba1612..8c4ee49 100644 --- a/net/netfilter/nft_byteorder.c +++ b/net/netfilter/nft_byteorder.c @@ -41,19 +41,20 @@ static void nft_byteorder_eval(const struct nft_expr *expr, switch (priv->size) { case 8: { + u64 *dst64 = (void *)dst; u64 src64; switch (priv->op) { case NFT_BYTEORDER_NTOH: for (i = 0; i < priv->len / 8; i++) { src64 = get_unaligned((u64 *)&src[i]); - put_unaligned_be64(src64, &dst[i]); + put_unaligned_be64(src64, &dst64[i]); } break; case NFT_BYTEORDER_HTON: for (i = 0; i < priv->len / 8; i++) { src64 = get_unaligned_be64(&src[i]); - put_unaligned(src64, (u64 *)&dst[i]); + put_unaligned(src64, &dst64[i]); } break; }