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 AB995433D8 for ; Mon, 11 Dec 2023 11:22:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A610C42DB0; Mon, 11 Dec 2023 11:22:07 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 687BB42DB0 for ; Mon, 11 Dec 2023 11:22:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SofNjrkR4MhBBcqkMXrHtJ6ihs/nmTUo+DpNRDAuV2QHOYulU6+HX/FAnrv7WgJr7cIJ+0MvoTTslrkBb1tgla/+IMCd2jIIwGpwGXmXf26oA6UBUwOZ88Qkha2vgkE3TDAjT+1sUwDrl18L7IrTLk6eK3KdH59p5KXA5IccevPJq9hX8cv0G0qNl6p0atNvoUb6CvZ07soDL7sAe0ZbfuUgE4dfU2L7sqjVzduh5qZYktQyaeRw2Ke5Oc34yN24429nCPjICx09GN5+lvaORrHtLMdSmJdTiInwhCBTAGordhEZLrdxVtxfmW1dV2Y4YYpSVo+nju5huGWqVAdYfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=UimnUGZtyrcuuVk/QG5mPwLd5Sf4WcoyxwX/9/PhgtY=; b=l/SvUW5Q6QGdSZglKNhiDPaOaIfhv49UiDyk2pL4hI+XmyJVUdfKPths9iyv6bL+RF4RIyM61nV4sGSC0Paxe5TYsFfHaDj5xeUAQWH8XbELHgP5x5MOilBpYxCL9TVjn2XKJOXJHE+PUARljeHUbEPNP/mRhRYdjWe2MEQOeNcMAUlZfnS+8LxsK1mWK6XdfILEzKzvK1QL7GZbk70NzWBuolcUIV2OoNEnHQwo53Dio9ri3Zz/YPOj7KhsMdMheeldEUnf++ENxPwV2not9rQsn+bP6xYsCQP5I6EteZW2c6QVeDxI5vVKGy09pBfGAVvcHyqNDu+QCiI9M2oMSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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=UimnUGZtyrcuuVk/QG5mPwLd5Sf4WcoyxwX/9/PhgtY=; b=GBIG68SH4fPaXtbY+oYPfqqxbAFjPw3UObboClcWtzXCGpFZTD4wRtPvpMZGHFH/W0oyRGYEJkWtX/Qeo2RtB0Y7p5kOAgKWBosefWCmMo2repJHNqIdQ2zbLyFdHYGJSMosfzAu/i6PM/7t/p9SDZsYL/nKNJ/+pLiXwpi2ItkSqpofmPjxj8IsYOo1ItgDdypTmjQPdAhkJgpv/EszOxH5B7G8vGqmV4DszX9Lwa407q+m73Dc2PaeR9ULXrTrdACq2zjiqc+ru0m80ppAuhVuEdFjy5UULv0Rnvx6xRhYF0nrl9V46IxrjYvrSTo5VrbMnzDemfSNvO0zKGY6Aw== Received: from BN9PR03CA0397.namprd03.prod.outlook.com (2603:10b6:408:111::12) by SN7PR12MB7833.namprd12.prod.outlook.com (2603:10b6:806:344::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 10:22:04 +0000 Received: from SA2PEPF000015CA.namprd03.prod.outlook.com (2603:10b6:408:111:cafe::3a) by BN9PR03CA0397.outlook.office365.com (2603:10b6:408:111::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:22:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SA2PEPF000015CA.mail.protection.outlook.com (10.167.241.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:22:03 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:21:45 -0800 Received: from nvidia.com (10.126.231.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.986.41; Mon, 11 Dec 2023 02:21:44 -0800 From: Xueming Li To: Brian Dooley CC: dpdk stable Subject: patch 'examples/ipsec-secgw: fix partial overflow' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:12:08 +0800 Message-ID: <20231211101226.2122-104-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: SA2PEPF000015CA:EE_|SN7PR12MB7833:EE_ X-MS-Office365-Filtering-Correlation-Id: b4b6a5ed-623e-4be9-d484-08dbfa33052d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Bu8mSsuUez67cMn+ahXHT54R/pjhhKUqa/+t2nrQ+Jxl48RzCUV1gDKRUEuZA2sM3Gc7urCvLB7sn5xXqOSVC2bp3e/qU6ahfq6A0DgiaXMzjWOSt95R9PiiAkbjrGq5hK4/3/19NvJEkbZ+afNh8mbIDYU4phOnW7NeudkAin4rRNBrbNbwt0wuEtEjWtljVGgNvFHUr1qbN8X2ZCQmMg0/vYK6J82Bdmk30YyEML3wwBSM649fkENfRcvcD8DEHQADilKB17jZURVkEuEyOd+Zxm7soyZ5wVv1qop2ytodqfelJtxFK7m9PLtAIz+kXDgvV/4xLYlmyTGfymyTHgCjP9NBpdQq/7dEfYAnYylA/Jrh47VGaXUgqpjIbpbYrJaNP5zlDXLeMt0qcDY25puaS+pCF9Vp+nEkDaVhAuOn8O6MnLXBCVMhEhZmKeNboCz4kjIqNnwzOfsmX88ugUIWKJZNaB1q2EhyeoZUwKdy8thuNz4uwImMBOs5WqCE/3VeZDB+3n4JOP3LZBne6q0I5fSNxFpY64997YDq3K9OBCaf1f6Yb+d7sBW+yfAOXdhuvwyjJpXzmzC5LeeM1EZBYxfuhbrMrhU35koSLjnHQPDhd1LmKEuF3YIZf49WjdUqvkmjp0DnOLNZFEJguVMFQ66gfp3F49FOvuKwSIJFysSmSsKfYa8rNdyYxhREqhr2Dwtq7vEcAWLyxG8HKhKGIJv0jTilFo3JCatmiK97C2H7Phl5gnFHhrdPdJKZYAmKgBYy4+ItHMmsgd0T6acRghiaWK8T+stU5TV4Tw0= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(39860400002)(376002)(346002)(396003)(230922051799003)(451199024)(186009)(82310400011)(1800799012)(64100799003)(40470700004)(46966006)(36840700001)(7696005)(36756003)(53546011)(966005)(478600001)(2906002)(6666004)(426003)(83380400001)(6286002)(26005)(4001150100001)(336012)(16526019)(2616005)(1076003)(4326008)(8936002)(8676002)(5660300002)(70586007)(70206006)(6916009)(316002)(82740400003)(7636003)(40480700001)(356005)(86362001)(55016003)(47076005)(41300700001)(40460700003)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:22:03.8816 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4b6a5ed-623e-4be9-d484-08dbfa33052d 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015CA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7833 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 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=2a720ab686c4645c3dc7c8c0b5c60adadbc29094 Thanks. Xueming Li --- >From 2a720ab686c4645c3dc7c8c0b5c60adadbc29094 Mon Sep 17 00:00:00 2001 From: Brian Dooley Date: Wed, 15 Nov 2023 12:31:01 +0000 Subject: [PATCH] examples/ipsec-secgw: fix partial overflow Cc: Xueming Li [ upstream commit ae9267a67e9030c1b069b0df69924aaca17683bb ] Case of partial overflow detected with ASan. Added extra padding to cdev_key structure. This structure is used for the key in hash table. Padding is added to force the struct to use 8 bytes, to ensure memory is notread past this structs boundary (the hash key calculation reads 8 bytes if this struct is size 5 bytes). The padding should be zeroed. If fields are modified in this struct, the padding must be updated to ensure multiple of 8 bytes size overall. Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application") Signed-off-by: Brian Dooley --- examples/ipsec-secgw/ipsec.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h index 6bef2a7285..2890e6e267 100644 --- a/examples/ipsec-secgw/ipsec.h +++ b/examples/ipsec-secgw/ipsec.h @@ -249,11 +249,18 @@ struct offloads { extern struct offloads tx_offloads; +/* + * This structure is used for the key in hash table. + * Padding is to force the struct to use 8 bytes, + * to ensure memory is not read past this structs boundary + * (hash key calculation reads 8 bytes if this struct is size 5 bytes). + */ struct cdev_key { uint16_t lcore_id; uint8_t cipher_algo; uint8_t auth_algo; uint8_t aead_algo; + uint8_t padding[3]; /* padding to 8-byte size should be zeroed */ }; struct socket_ctx { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:26.426334000 +0800 +++ 0103-examples-ipsec-secgw-fix-partial-overflow.patch 2023-12-11 17:56:23.217652300 +0800 @@ -1 +1 @@ -From ae9267a67e9030c1b069b0df69924aaca17683bb Mon Sep 17 00:00:00 2001 +From 2a720ab686c4645c3dc7c8c0b5c60adadbc29094 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ae9267a67e9030c1b069b0df69924aaca17683bb ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 5059418456..bdcada1c40 100644 +index 6bef2a7285..2890e6e267 100644