From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 63337457A1 for ; Mon, 12 Aug 2024 14:52:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B9CF402C3; Mon, 12 Aug 2024 14:52:18 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2041.outbound.protection.outlook.com [40.107.100.41]) by mails.dpdk.org (Postfix) with ESMTP id 047894029C for ; Mon, 12 Aug 2024 14:52:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Vc0DEFZKnSCIWcGb3CVMTSd/cseR2ElbIfBXMM4MZ3cmgB2uK1B2q5iX9yPCGeDxCBg3PfMiD5EXTgqkSKx2/FXmBF/sihk7ILKaSGKg++JjTDtQFznWlyeczqmNZgh+WjI8q0ULTLXxCILqngnjM/Cj/6nail3V6PQssbY1wu2lXDoVzYFBPbdoDEcY0aTs08EawU/0LBG3trTOsWZ8/PqELSDyvGDqMSGNLIM3uI7RuQT6qkj2S4wD5Jq5kPGvd9nhOdaY5it/PwCDIfnsslYpYYzRoGFZfRlJFiBDNZX2om+27S/Sz0L54XeXBbsSDweySkZ1X7tVt5rW746c8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mJo+pELSidfZl8nx1MJErPwabjjadn4kDqsFWy/Ezsk=; b=VdIUcLEoamaAPGy5QPbCJh7aUgxq+Qfx7XYtnFEmEzlkF0sV3+IWrncUR0g7BMvmUteLmd9RkSVrXk44DAGwEeCo7kUjrYKXqGPJxskEIQsgJvUfYYfjUTN+U8Im5Mfh8b4JY5uTky/e8bW1IfpqfcLuSpd33B5bqBLCG4PXqCbgJmKJ7BJC3d38a37mvDCqelfGQT9dFZy3xhIp5rQ0GZjLarP2ebnk9r7KUCkxrSuUNUFCDOo9kVXpshaAi4ki7rksXobK7H8HeSb5HsJHSW7cDlzXokgSgDpBYka/2vdkIhi5VtY5+S0evJu0hv0VvmhkPwMm1+a+FRjIEb0Hjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mJo+pELSidfZl8nx1MJErPwabjjadn4kDqsFWy/Ezsk=; b=pk0XwoqV3V1lh+E6kyDKQeWYQzHKrCwKIkpYKhVvrXVoawrXw3rhjHTs0egg0Wrt4p82JHq+2Gl1ezafgKaWM4FBH3QnWxPJej2+VHDWIkOHmfkGOEKIRb7VECnW2XRLhskoHvP8hpPny03VGutgWZQd5gLM8xMqZHJpYG8JI9zPKxLp+4Rs8hzX/WWGYIxO77ZNVQoxuS5SAqYunuIGMIfHbjUPeQYnrns/lL+zDCoBS+PnCHWGIydOa4NV7yPZnww9mgnX3XnPyu5JBffobkllGhXUQI1AFuRrjzGyMq6taWevazUSwlmB6afStD9CvDvdc8JBrkBrzEJh+9r1eg== Received: from SA1P222CA0011.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:22c::13) by DS7PR12MB9041.namprd12.prod.outlook.com (2603:10b6:8:ea::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:52:13 +0000 Received: from SA2PEPF00003F66.namprd04.prod.outlook.com (2603:10b6:806:22c:cafe::b9) by SA1P222CA0011.outlook.office365.com (2603:10b6:806:22c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:52:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF00003F66.mail.protection.outlook.com (10.167.248.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 12:52:12 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:52:00 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:51:58 -0700 From: Xueming Li To: Konstantin Ananyev CC: , =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'bpf: fix MOV instruction evaluation' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:08 +0800 Message-ID: <20240812125035.389667-12-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00003F66:EE_|DS7PR12MB9041:EE_ X-MS-Office365-Filtering-Correlation-Id: d16c093a-8b67-45c2-bdde-08dcbacd95a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?OEZoOG5wREg1a2pwZnlxV1JXZlc2U2IzbjdaREpETWxnV0p0UHpRK3poVi83?= =?utf-8?B?dVFTWjlMdlNVZTdzR29zRTY2OEZlYWJlQXhWSFpsK1JHdGpWYXVYa1JFbXps?= =?utf-8?B?NW53VWc3aGFUVml0QU1KQVVIMk1YWnIwYTNOeUM3NVpSbFU1ejFaSnhlb2o0?= =?utf-8?B?SzZESFptTTFWQi9pWkMwM2dYeGp0RjFKUlNGTXpqOExGbzZiNFJCUThCMUk5?= =?utf-8?B?aW9CdldhcWczbTlYVTJxZTB2Tkw4YVlnd09ydlVjcVlDTktxZ3pPTUNMOUVx?= =?utf-8?B?VnVyL0FZdTNxUUNHVFZaNHY2WFZRMjYwMmZXZCs1bzZxenVrT2diSHhKTThx?= =?utf-8?B?aG5TUmlQdU40SmR4Mk51ZzBTQUtlNnF0VGxYTCtDbUJqV0tiZFJyQnRmZWM4?= =?utf-8?B?MWRUMDhLa3hzSDFrck5LY2MzbGNydjB6VGtHYVhqMlA2bEw4Qk1WUUhVYVVs?= =?utf-8?B?NUtKL2lGdXFUd0VXWE1hOFUybW5ubm5EbzgzMndoSFEwVExtRmhONGpDVC9m?= =?utf-8?B?UWhpdlFvRlpWTEpldXlwS3o4dzZkSWpZc1FvWnJDczFwMUVZdUtkQ1R4ZGti?= =?utf-8?B?b0xjS0s1L2pFQWFCZUx5MHNlRzVlRUFkQk1kSjFGemxmS0JPUXA1K2dZbzJY?= =?utf-8?B?THZRM2JST2wvZm9xWml3dGZvam01ZUJaMnQ0V3JUNXVFaEhzbmZ4TzZQRUhq?= =?utf-8?B?TGIwOThqanZaelZzWXpnZGlHTUV6WWl2d1pKSnZKN2J4VS9Fa1JQZ1BrOUhw?= =?utf-8?B?OXduTklVREJMaWpHYnlwRnUvRG1IYVBUdmllb3dGYXErbVVjanVYSGFDQW1Y?= =?utf-8?B?YU9NaDV3K1BWaFpRTFg2am92cTNsZExtWHhyb3ZqMHBpQ0JCR3k5V0R5enZq?= =?utf-8?B?OVl1ZUJSbm5vR08zV0Fya1lmLzZEaFpwMVJRenBoSmE2cnVvMGNwNDFzMGlB?= =?utf-8?B?QTZmNW1NNDMrWFpqdzhQWGhWQ09TeEt5VDRQaGJkNmRjT0ZvR1RaT3FmUnRU?= =?utf-8?B?a01KTXVXMWxaTkxvYkpxYm0yYm0rUHVkdTJVNFFUNDkwUEdaZ0huTktYZ0lS?= =?utf-8?B?NXJ5ZE1kbjV6REQwamE5WXgra1liRlByNXBHcXFMVkFlVTA0Rk4vSVZhYUpE?= =?utf-8?B?WFBFWmNOSk9pbE12UE0wRXFkTUpoc1cyRTRDTFh6VXhQSXNJSFNrdUxkcjZF?= =?utf-8?B?aTVWa3ZtUHcxeXhVOSttNy9mRUw2K3FJVXlPNENDeUhsZWxTNjhqSm9qWENx?= =?utf-8?B?R1VMSWlvRFRINlJBREZWSHRVQjBWUXEzNWJqTUpnZFd5R2dzamJjejNJWXln?= =?utf-8?B?VGQxdXFRUUw5WXd4NXpHVkE4MFZDZXhUem93UDB0dnBwK3ZkRmRKWE5aK29H?= =?utf-8?B?WTdzcisrSUhvMFZrekFHRGZnL1JCalB4dnExVVpTRzhQNHc4Ukd3Vm1PbCtl?= =?utf-8?B?UnNKaDc4Wmx2cWt3UmhqaDUvMGp2a3EweGRMUXEyN1J1YjlwWk5PcGpnQVZB?= =?utf-8?B?QzU0aVcwbzM2THh3Wk9HakNrcHhGQzJ0bEtRYnM0ZXRQemJCMldHOUVCVlZy?= =?utf-8?B?YndmV2t6WjQ3UjU1eGx3blh3aWFJaXhqanljcHhNMVNKN2ZnOEw1R3pKZnJJ?= =?utf-8?B?MXIyVFdmQnRpckszYjVLV3liNFhveTlsd0VxLzN1NVZWZnY0V1dtK1pnNGxv?= =?utf-8?B?ZTBnbHNHcmpSYXU0bXVyWjN4WDc3VEhsYW9zS2h5Q0JYYmc0NEhyV01hbkla?= =?utf-8?B?QjhMUFZUZTRhdi9way85K0Z5eitrVXVVYWJmdFlVUzdjWVVrK0UrTWV6blFM?= =?utf-8?B?VjZCTklWVlN5dmFuclhPTVVwUjdPalVqYzQxbFpBQzUvU2Z0aFNIWncyVXgx?= =?utf-8?B?WDZ1RXVzNVZNNkRESkhpN21VM09Kc2VoV29WUUtRaEc0RCtPOWJuK1NGVU95?= =?utf-8?Q?nQ1a1Q3zFoya2OIAw+G9xpbwXslnC0yI?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:52:12.0287 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d16c093a-8b67-45c2-bdde-08dcbacd95a8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00003F66.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB9041 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=59523f029eaa71f9332420cc4e3706fe6c9312ad Thanks. Xueming Li --- >From 59523f029eaa71f9332420cc4e3706fe6c9312ad Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Thu, 27 Jun 2024 19:04:40 +0100 Subject: [PATCH] bpf: fix MOV instruction evaluation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 3eef64655bfe3602f4e3235e2533932205f24569 ] Verifier might left some register-state values uninitialized while evaluating MOV instructions. Add explicit initialization. Fixes: 8021917293d0 ("bpf: add extra validation for input BPF program") Signed-off-by: Konstantin Ananyev Acked-by: Morten Brørup --- lib/bpf/bpf_validate.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/bpf/bpf_validate.c b/lib/bpf/bpf_validate.c index 95b9ef99ef..65f9d114bc 100644 --- a/lib/bpf/bpf_validate.c +++ b/lib/bpf/bpf_validate.c @@ -636,14 +636,14 @@ eval_alu(struct bpf_verifier *bvf, const struct ebpf_insn *ins) { uint64_t msk; uint32_t op; - size_t opsz; + size_t opsz, sz; const char *err; struct bpf_eval_state *st; struct bpf_reg_val *rd, rs; - opsz = (BPF_CLASS(ins->code) == BPF_ALU) ? + sz = (BPF_CLASS(ins->code) == BPF_ALU) ? sizeof(uint32_t) : sizeof(uint64_t); - opsz = opsz * CHAR_BIT; + opsz = sz * CHAR_BIT; msk = RTE_LEN2MASK(opsz, uint64_t); st = bvf->evst; @@ -652,8 +652,10 @@ eval_alu(struct bpf_verifier *bvf, const struct ebpf_insn *ins) if (BPF_SRC(ins->code) == BPF_X) { rs = st->rv[ins->src_reg]; eval_apply_mask(&rs, msk); - } else + } else { + rs = (struct bpf_reg_val){.v = {.size = sz,},}; eval_fill_imm(&rs, msk, ins->imm); + } eval_apply_mask(rd, msk); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:02.972122163 +0800 +++ 0011-bpf-fix-MOV-instruction-evaluation.patch 2024-08-12 20:44:01.895069255 +0800 @@ -1 +1 @@ -From 3eef64655bfe3602f4e3235e2533932205f24569 Mon Sep 17 00:00:00 2001 +From 59523f029eaa71f9332420cc4e3706fe6c9312ad Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 3eef64655bfe3602f4e3235e2533932205f24569 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 79be5e917d..11344fff4d 100644 +index 95b9ef99ef..65f9d114bc 100644