| Message ID | 20240311024939.2523778-2-chaoyong.he@corigine.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | akhil goyal |
| Headers |
Return-Path: <dev-bounces@dpdk.org> X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8754C43C7F; Mon, 11 Mar 2024 03:50:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 962CA402DF; Mon, 11 Mar 2024 03:50:04 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2112.outbound.protection.outlook.com [40.107.237.112]) by mails.dpdk.org (Postfix) with ESMTP id 93D71402D8; Mon, 11 Mar 2024 03:50:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jV4/wdLghv1JBbeuJ3/1fZeytn8455zljPddgNYYhPefTd+fEA0JyqFbl7CW26C3g4H4SiZxudMpSv9lr+J/fdFPzsP3JMZSwZLQS2+Xez/Spq/6VoC06MdiFdNZBFNxrurQ8/2F4vf7VnkA5V9U1tO0Hf5DWca9+QxH52DsGZhDaG3Kb1SHFwInaucif49GbvxSXCCmVnf7bUE9awULNaQDiXY53XI8VvogpKlC7iPjxCjVmbwYTC0UWDvnhmtTWlXvEzq/HxM9goKFZ0ywq6gl9NOOXqHJ8e/401Kclv2y0C+cQVh9QZaFnwhM8g20lon4wnLVIrGynRw0opQETA== 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=jo/isiK0RbYpR/lKLIAOe9kkiaht5GCDZAQ5hdKoGLg=; b=LYJRXfdBmecjbqRAlFMJvrP9e+CixNo2GBwdUaOZ22zTeHQ4qU0efCt+CsJbSZD26GPK+e2xPFfWpc3lNJauou76n2VlFuYFkuPSUNX6Fvnvo9ldapR1ZRAYI0LUnY7EZJPab6LrWCPAtdztLNYJOdsr9eX07HNMSPyABGLDJScSl6y+yW10BE6hAJce4zkbCKhB7NG2FQsovT1K7cn+rk38z/5UCg/9cy21/90xEvJWDnyXiePPGJoNzjUDOthc/o4z0oVYjGfCsTXzL4FhkEj2Dre1l6NFDwRbMN5HPecV+EAPd+vulbnx52elwe/1hVNFiVcwpjOZL4HOndF3/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jo/isiK0RbYpR/lKLIAOe9kkiaht5GCDZAQ5hdKoGLg=; b=njH9jywFNMgR8q2xFCA4vnKZUCfpm0cqUad4aYuNIUBEcTxdSLghNbemvEXz1Z7uIvZZLvPGXubC/N2BWkmOOFY2faNrnVGY4Dvz7mmwoMlpMKO3ZnF2gKh6X5Kt4Wh7LiVofwk32wje+UdctdsZw7XuiKkWsoVqGMdkbmIx8oI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH7PR13MB6244.namprd13.prod.outlook.com (2603:10b6:510:247::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.33; Mon, 11 Mar 2024 02:50:00 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7339.035; Mon, 11 Mar 2024 02:50:00 +0000 From: Chaoyong He <chaoyong.he@corigine.com> To: dev@dpdk.org Cc: oss-drivers@corigine.com, Shihong Wang <shihong.wang@corigine.com>, stable@dpdk.org, Chaoyong He <chaoyong.he@corigine.com> Subject: [PATCH 1/2] examples/ipsec-secgw: fix SA salt endianness problem Date: Mon, 11 Mar 2024 10:49:38 +0800 Message-Id: <20240311024939.2523778-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240311024939.2523778-1-chaoyong.he@corigine.com> References: <20240311024939.2523778-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: PH1PEPF000132E8.NAMP220.PROD.OUTLOOK.COM (2603:10b6:518:1::28) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6244:EE_ X-MS-Office365-Filtering-Correlation-Id: f8ea460e-95f0-494a-e61c-08dc4175f195 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pDbBqHOKpr+DRNiD4VEY1IJqx0vaOfCZ4kMvQ3HsaHHgpWmotaTzvTef1JaUrzfo8OzBBLHMMdeaeC/hXKZtOoXCqSztuRPUSySOa6M1psuk4bOmcIId4tI3+UFELRMuEI4VOLTROOBNObN3+Mu/CNUIQtXR3PDWj9x/6Thi7UNnehnhW82yLPAJqyfMcLiYiMck94u+ygm6+JIoFhfOX3F/QCr07NbkPSbBkKV6el2LAT+AgROzrRCZsnxycBUiaKTPVmVmyP47XxUA4Y/5TiieqQoc+HuwpCkheyaadbmyoL/oPVH/zkVj4BZs/6agj3f2oKzbp/fTYgJhpuIHn7n1tnicxGrJY7LYLHqlAzwMjrXTWsE75t081Rt/sDzisojcsUnkgJ6jFkiQkTUFCP0vE9VRZs5LaOd04xIXLLk3/UoUCXoHCQl+c0Pg+HpXnjFGyGSENZneRN66c0Q+G0qYULMu45ks/xtMELkHfUhT6qBq5gte03lI4UF0qoi/CScUuKsWEym9IwF7XcSL+8mSUlDMH6MSd+ekL3eQHnPtZNO15UFz/d+lJn85q4UDrwgs3cDzMHOyPoWiKYn6XU9TnNusUmjCEQQ/hzFzL/O1xbUE2j2Xd8X8VURHLm0OL00P1MAXi/0ay51s1/OLtxKa4YyS316c567Kc9UCHhS6jUKsVU2XY5cFRfaoqCk/IuFdsZkZ9yd+7axfsuJ668aqk7M8zIa8k+t9rECEmQ8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(1800799015)(52116005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?1Kf/dCxshaG9K5thfRXewoED9ImR?= =?utf-8?q?VCNVAtRX6Uaq5W8QndEy7/8TUKdtMbijzyr5ahI4aqNd5e1a2kgVOGjTrFQ0vRXmc?= =?utf-8?q?XrxhxT3PUxN5FTBxTHTRmQl99ulVLHy72mZBnBjWB5ImLGBvrGU670O46ifP5SpH3?= =?utf-8?q?5IqZ+bwuZ3eZXn/5Z4vUPGKczu2eLn2ySlgF4l6g+OtdccshQA2fTRZPEb2aGYYRy?= =?utf-8?q?JHkAh0FJDIXRtOZCL3zyQ161fVZ/jw6mf8ZDay8eicSHIHN+e2wXq0IKtpMN7RoSQ?= =?utf-8?q?+grNcW0b9Ev9MHDo7EtzWhVamAWxTcBAAZNGENL2S683BJORkzl3ybGzZEFT3Al8M?= =?utf-8?q?V8TNUOqlL1NB3fSMGzViK16zK82PX9xGOJg36YVIK196Yz9O0i0I0hfynWopuhz6G?= =?utf-8?q?C3spN/3hDBfZ3yBcJ4gmqx3dRk01CpHnzXmXGjy49dCnAJbWm27xblvP2cE6c5Qn/?= =?utf-8?q?LBrI7CPNLbK7yOK7VChIwjhuxs9aqpdfP5YQ/Dm9O6aMD6T82gn2MnOlF+MB5A/8I?= =?utf-8?q?S08wPsOAn5ZHVk2TGi0sAD0mGtCe3i5BCJl3ubbd8XiyrSASBXA6IHlPdLCD0IvGV?= =?utf-8?q?bWorh8cJTbw4qn2IrMsNSXXqo1IAXJ2f7f1vyEOcd5dO+1AND/3nJYxH0RO6HiTcu?= =?utf-8?q?UKIdH01LtWqQM4hWU5R+rDCmwWXfqXi42KsI9eFNgfO7s7SDt5ucedSznVTpcRXzm?= =?utf-8?q?hhRJYG+AMizPts9lnL15F0X+rIAl8J4L/YbHCenhcVjIJ4MRuoaeOte5Rc6Xg/san?= =?utf-8?q?BA0EmES03nuTlyXdG3V0eaPfHp7eBaaMtfbkK9tRnj9Nxfhw5AENzz5h4rPUSEVDw?= =?utf-8?q?SbM8XhvcLZlk4YkTn2JH+/3P1ZxN4+mKvsoGp/OP4rxhMC4FrhOpAHdH4Wj2nC2Oa?= =?utf-8?q?41MrrmfLIF6SaORUfS0410dbsrRDMI6say4qt9ckDwgxkoyESv/dHZ7YcDOZ5Sew7?= =?utf-8?q?xfmVEC2RzfugdhW4vQ2P5oBlx/bIS5Rt8p0UdVxZAVMJkAvgFDZU+s7+iVsOea6fl?= =?utf-8?q?ElDMQjN/kmihP8V0Kyjr+yRC4HjPDYucvqhd/nF+VFFlG+ay+435d++S79j6e2z6i?= =?utf-8?q?E3LcuelpyDfupnWAhHpdkjTXeGR1z0lKwNoeIU0LgwPkp8P2bWAC/euiEC2/keak6?= =?utf-8?q?/zmM02GZWjAh4155IdGJesP8Or6wXEAaZKULOKJ1cWCzynGVhtOUe4srMBXXn94wg?= =?utf-8?q?STaqBVSFaKJjSM7a4hm64fQ1BIH3/NQWtVPuLZqfgkuZs+gE7XbM6I90sV/JNuozw?= =?utf-8?q?/UUK7v/0794Pc6AgJNQkPmVLZA4fcSaRULOXSemWSAGJKoEk4uDcdZkK2MitKNbaD?= =?utf-8?q?vLwFdaxoPQr7YUzULRqyZRGUWal3o3wW//+l2ovseZfOVsmQ3iap1xVx0XRcqII0+?= =?utf-8?q?YBmr+fgN9nUo1hD/74XqK6Qj+H5qK8AdZBrzWZhOKiuGb90zThvL65PIyRvAqTwgH?= =?utf-8?q?KbPFxMaSZfxZvgYaXJWUvAWTq1nHC7W3TIkcpogIqA43mevZtS6iM/B9ImkuzCdit?= =?utf-8?q?voqoeBgn9sC0iY/qOjwQTFh8tRr7rBLTGQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8ea460e-95f0-494a-e61c-08dc4175f195 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2024 02:50:00.3177 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZE7niLe7yDbTDfp+5pdjWYg9fKyxFJIEWZDJfqTwgL7RGn7IDOOTujUXi3fLe7FrjRiqOv45OexJFHLP6GkGQ1R7rbcSAXmat87SaPTr9wA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6244 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions <dev.dpdk.org> List-Unsubscribe: <https://mails.dpdk.org/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://mails.dpdk.org/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <https://mails.dpdk.org/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org |
| Series |
fix IPSec endianness problem
|
|
Checks
| Context | Check | Description |
|---|---|---|
| ci/checkpatch | success | coding style OK |
Commit Message
Chaoyong He
March 11, 2024, 2:49 a.m. UTC
From: Shihong Wang <shihong.wang@corigine.com> The SA salt of struct ipsec_sa is a CPU-endian u32 variable, but it’s value is stored in an array of encryption or authentication keys according to big-endian. So it maybe need to convert the endianness order to ensure that the value assigned to the SA salt is CPU-endian. Fixes: 50d75cae2a2c ("examples/ipsec-secgw: initialize SA salt") Fixes: 9413c3901f31 ("examples/ipsec-secgw: support additional algorithms") Fixes: 501e9c226adf ("examples/ipsec-secgw: add AEAD parameters") Cc: stable@dpdk.org Signed-off-by: Shihong Wang <shihong.wang@corigine.com> Reviewed-by: Chaoyong He <chaoyong.he@corigine.com> --- examples/ipsec-secgw/sa.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
Comments
> Subject: [EXTERNAL] [PATCH 1/2] examples/ipsec-secgw: fix SA salt endianness > problem > From: Shihong Wang <shihong.wang@corigine.com> > > The SA salt of struct ipsec_sa is a CPU-endian u32 variable, but it’s > value is stored in an array of encryption or authentication keys > according to big-endian. So it maybe need to convert the endianness > order to ensure that the value assigned to the SA salt is CPU-endian. > > Fixes: 50d75cae2a2c ("examples/ipsec-secgw: initialize SA salt") > Fixes: 9413c3901f31 ("examples/ipsec-secgw: support additional algorithms") > Fixes: 501e9c226adf ("examples/ipsec-secgw: add AEAD parameters") > Cc: stable@dpdk.org > > Signed-off-by: Shihong Wang <shihong.wang@corigine.com> > Reviewed-by: Chaoyong He <chaoyong.he@corigine.com> > --- > examples/ipsec-secgw/sa.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c > index c4bac17cd7..4018b0558a 100644 > --- a/examples/ipsec-secgw/sa.c > +++ b/examples/ipsec-secgw/sa.c > @@ -374,6 +374,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > uint32_t ti; /*token index*/ > uint32_t *ri /*rule index*/; > struct ipsec_sa_cnt *sa_cnt; > + rte_be32_t salt; /*big-endian salt*/ > uint32_t cipher_algo_p = 0; > uint32_t auth_algo_p = 0; > uint32_t aead_algo_p = 0; > @@ -508,8 +509,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > if (algo->algo == RTE_CRYPTO_CIPHER_AES_CTR) { > key_len -= 4; > rule->cipher_key_len = key_len; > - memcpy(&rule->salt, > + memcpy(&salt, > &rule->cipher_key[key_len], 4); > + rule->salt = rte_be_to_cpu_32(salt); > } > > cipher_algo_p = 1; > @@ -573,8 +575,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > key_len -= 4; > rule->auth_key_len = key_len; > rule->iv_len = algo->iv_len; > - memcpy(&rule->salt, > + memcpy(&salt, > &rule->auth_key[key_len], 4); > + rule->salt = rte_be_to_cpu_32(salt); > } > > auth_algo_p = 1; > @@ -632,8 +635,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > key_len -= 4; > rule->cipher_key_len = key_len; > - memcpy(&rule->salt, > + memcpy(&salt, > &rule->cipher_key[key_len], 4); Can you put the memcpy call in a single line? > + rule->salt = rte_be_to_cpu_32(salt);
> > Subject: [EXTERNAL] [PATCH 1/2] examples/ipsec-secgw: fix SA salt > > endianness problem > > From: Shihong Wang <shihong.wang@corigine.com> > > > > The SA salt of struct ipsec_sa is a CPU-endian u32 variable, but it’s > > value is stored in an array of encryption or authentication keys > > according to big-endian. So it maybe need to convert the endianness > > order to ensure that the value assigned to the SA salt is CPU-endian. > > > > Fixes: 50d75cae2a2c ("examples/ipsec-secgw: initialize SA salt") > > Fixes: 9413c3901f31 ("examples/ipsec-secgw: support additional > > algorithms") > > Fixes: 501e9c226adf ("examples/ipsec-secgw: add AEAD parameters") > > Cc: stable@dpdk.org > > > > Signed-off-by: Shihong Wang <shihong.wang@corigine.com> > > Reviewed-by: Chaoyong He <chaoyong.he@corigine.com> > > --- > > examples/ipsec-secgw/sa.c | 10 +++++++--- > > 1 file changed, 7 insertions(+), 3 deletions(-) > > > > diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c > > index c4bac17cd7..4018b0558a 100644 > > --- a/examples/ipsec-secgw/sa.c > > +++ b/examples/ipsec-secgw/sa.c > > @@ -374,6 +374,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > uint32_t ti; /*token index*/ > > uint32_t *ri /*rule index*/; > > struct ipsec_sa_cnt *sa_cnt; > > + rte_be32_t salt; /*big-endian salt*/ > > uint32_t cipher_algo_p = 0; > > uint32_t auth_algo_p = 0; > > uint32_t aead_algo_p = 0; > > @@ -508,8 +509,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > if (algo->algo == RTE_CRYPTO_CIPHER_AES_CTR) { > > key_len -= 4; > > rule->cipher_key_len = key_len; > > - memcpy(&rule->salt, > > + memcpy(&salt, > > &rule->cipher_key[key_len], 4); > > + rule->salt = rte_be_to_cpu_32(salt); > > } > > > > cipher_algo_p = 1; > > @@ -573,8 +575,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > key_len -= 4; > > rule->auth_key_len = key_len; > > rule->iv_len = algo->iv_len; > > - memcpy(&rule->salt, > > + memcpy(&salt, > > &rule->auth_key[key_len], 4); > > + rule->salt = rte_be_to_cpu_32(salt); > > } > > > > auth_algo_p = 1; > > @@ -632,8 +635,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, > > > > key_len -= 4; > > rule->cipher_key_len = key_len; > > - memcpy(&rule->salt, > > + memcpy(&salt, > > &rule->cipher_key[key_len], 4); > Can you put the memcpy call in a single line? Okay, no problem. I will send a v2 patch to fix that, thanks. > > > + rule->salt = rte_be_to_cpu_32(salt);
diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c index c4bac17cd7..4018b0558a 100644 --- a/examples/ipsec-secgw/sa.c +++ b/examples/ipsec-secgw/sa.c @@ -374,6 +374,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, uint32_t ti; /*token index*/ uint32_t *ri /*rule index*/; struct ipsec_sa_cnt *sa_cnt; + rte_be32_t salt; /*big-endian salt*/ uint32_t cipher_algo_p = 0; uint32_t auth_algo_p = 0; uint32_t aead_algo_p = 0; @@ -508,8 +509,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, if (algo->algo == RTE_CRYPTO_CIPHER_AES_CTR) { key_len -= 4; rule->cipher_key_len = key_len; - memcpy(&rule->salt, + memcpy(&salt, &rule->cipher_key[key_len], 4); + rule->salt = rte_be_to_cpu_32(salt); } cipher_algo_p = 1; @@ -573,8 +575,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, key_len -= 4; rule->auth_key_len = key_len; rule->iv_len = algo->iv_len; - memcpy(&rule->salt, + memcpy(&salt, &rule->auth_key[key_len], 4); + rule->salt = rte_be_to_cpu_32(salt); } auth_algo_p = 1; @@ -632,8 +635,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, key_len -= 4; rule->cipher_key_len = key_len; - memcpy(&rule->salt, + memcpy(&salt, &rule->cipher_key[key_len], 4); + rule->salt = rte_be_to_cpu_32(salt); aead_algo_p = 1; continue;