From patchwork Fri Nov 25 12:16:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianjia Zhang X-Patchwork-Id: 25962 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3971039wrr; Fri, 25 Nov 2022 04:17:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf52syfzlR8qVeQPqbh4fAsfyNJnpC3etemIRXfPOOSPnRGHDGpdk7DuBgwy2LX+mFUZMxN6 X-Received: by 2002:a17:902:c7d1:b0:188:5681:4dc8 with SMTP id r17-20020a170902c7d100b0018856814dc8mr18361606pla.23.1669378665548; Fri, 25 Nov 2022 04:17:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669378665; cv=none; d=google.com; s=arc-20160816; b=c4G7hL3RJLJ0lKRJlph1oovx5KLb4YcdkPVD7w+iSHdMgQPqFWEq7x5j3HKSxqDwQK ChZVLz9+BoXMGdVZKyJZHpRP4gneOeNoJu4iqwhqmBiJ0OFbkenoUwHS3JcnuBUDQtuK dq2EsaoxEbgG8MI96X5x41/oQIhrOEwZj6U/IVldZj/+OqAyBWnbbQbdkzrW8GKgdoKe 84+8c07Uy/YrmHQMaxdCS0aTSvXTSWGB6/wX3Dv51s5AGf9UK8xuIAonO2ltmXZwSDNj hKAE191JfSUI5myiy9dlcENveFOnX6rDXPEb9906W7uayNIWhURD2arN0Z1KFNEAU3js jteQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=l0h3ch2bhhEAXGZP9bwX2VjD30wMZImlfDTFskfVrYM=; b=kyuueMYQER/ivWcC7wu1xWS/1kVACpFdnEEunP8p/4p3ob2vGfkmWU85Kd6YLc6X3V vh474fslm5Yx5R2Vi4pfWDC1nLVGytp160NM7VmWEMWOFnK2aFDXoi1eAQ95oG/1tO2s F2bQjQb5G384sJ2TRbfHB9Ndts/UWdd+hJFVxE2QUgF7kf/G1FytFkUzHSiH0rKyyska M1IsVBJ4vellOkuMVIsnL1B/BE6Xrq0MlaUXij7hZ5oXK0FlZt+I7iPKtnW1nW6lZr2t Qk0q5R4AhGVoRtfGkpyTcaRqS6EsICl0785090G8ZAbtCBA/G27r56Shi80am2Yx3FBF Rceg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g25-20020a632019000000b004772bd7e38esi3955122pgg.868.2022.11.25.04.17.32; Fri, 25 Nov 2022 04:17:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229844AbiKYMRI (ORCPT + 99 others); Fri, 25 Nov 2022 07:17:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229575AbiKYMRD (ORCPT ); Fri, 25 Nov 2022 07:17:03 -0500 Received: from out30-56.freemail.mail.aliyun.com (out30-56.freemail.mail.aliyun.com [115.124.30.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BA184A585; Fri, 25 Nov 2022 04:16:57 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=tianjia.zhang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0VVfHzfl_1669378597; Received: from localhost(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0VVfHzfl_1669378597) by smtp.aliyun-inc.com; Fri, 25 Nov 2022 20:16:38 +0800 From: Tianjia Zhang To: Eric Biggers , "Theodore Y. Ts o" , Jaegeuk Kim , Jonathan Corbet , Jens Axboe , Ard Biesheuvel , linux-fscrypt@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Cc: Tianjia Zhang Subject: [PATCH v3 1/2] blk-crypto: Add support for SM4-XTS blk crypto mode Date: Fri, 25 Nov 2022 20:16:29 +0800 Message-Id: <20221125121630.87793-2-tianjia.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20221125121630.87793-1-tianjia.zhang@linux.alibaba.com> References: <20221125121630.87793-1-tianjia.zhang@linux.alibaba.com> MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750470403914958252?= X-GMAIL-MSGID: =?utf-8?q?1750470403914958252?= SM4 is a symmetric algorithm widely used in China, and SM4-XTS is also used to encrypt length-preserving data, these algoritms are mandatory in many scenarios. This patch enables the use of SM4-XTS algorithm in block inline encryption, and provides support for fscrypt. Signed-off-by: Tianjia Zhang --- block/blk-crypto.c | 6 ++++++ include/linux/blk-crypto.h | 1 + 2 files changed, 7 insertions(+) diff --git a/block/blk-crypto.c b/block/blk-crypto.c index a496aaef85ba..e44709fc6a08 100644 --- a/block/blk-crypto.c +++ b/block/blk-crypto.c @@ -36,6 +36,12 @@ const struct blk_crypto_mode blk_crypto_modes[] = { .keysize = 32, .ivsize = 32, }, + [BLK_ENCRYPTION_MODE_SM4_XTS] = { + .name = "SM4-XTS", + .cipher_str = "xts(sm4)", + .keysize = 32, + .ivsize = 16, + }, }; /* diff --git a/include/linux/blk-crypto.h b/include/linux/blk-crypto.h index 69b24fe92cbf..26b1b71c3091 100644 --- a/include/linux/blk-crypto.h +++ b/include/linux/blk-crypto.h @@ -13,6 +13,7 @@ enum blk_crypto_mode_num { BLK_ENCRYPTION_MODE_AES_256_XTS, BLK_ENCRYPTION_MODE_AES_128_CBC_ESSIV, BLK_ENCRYPTION_MODE_ADIANTUM, + BLK_ENCRYPTION_MODE_SM4_XTS, BLK_ENCRYPTION_MODE_MAX, }; From patchwork Fri Nov 25 12:16:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianjia Zhang X-Patchwork-Id: 25964 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3971481wrr; Fri, 25 Nov 2022 04:18:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf5jNEcsoHa0sfCIjtJKrNEfcMOyWAbbv3rE5tVIU++wUWwaeH5IfXVLjlTrdvp50HZvZG3N X-Received: by 2002:a17:903:1206:b0:186:a2ef:7a74 with SMTP id l6-20020a170903120600b00186a2ef7a74mr21997349plh.148.1669378706204; Fri, 25 Nov 2022 04:18:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669378706; cv=none; d=google.com; s=arc-20160816; b=hV/Mn6wi4yrSIuyButJnYSTEZnkpkKdyQE96RhdlVzO12mO/c9MdFsv8cM/2hTcEeR gx49ZY0FlipP1BOVAnQkfJ76rseM6L8DOf/CCnCEATayinzUity3eHO0df6q220EludX Wg3a9tNHbvq9MpHW9gKafa2Px2tY74KxD925koWycRyFwnIIQrRobirRKjlcORhCUYLz c/XcGng37dNClukZBhn1ZZUIPZ23jVq/1meaK5AtahvvMelUSI865xBUs/J/CMW09nX/ H8tN9TroYXjvelHS2ekFkB9OtKWoSwqF78Z0/J6hd2PNN6Yw/79qGeR3eU9grbLYTtI0 kAOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0fY3xbIdNWqd2tyiZGL3qwmB3MVnk0wwDf+asy5Do3E=; b=uCHRolQjiBxtS6ckN4EXi9KuBvHXJ1P+65xUbBKmUqK3LJ7+233JanCIheZoGgkQ5Y eSdtmjLNKQ3Z0TQDCMhxdO8DSA8zNW3R7OV3NJ03XPuwKMDP3nQEv8VDP9KFaD1a/oPY nyVQGyemuPA2aR8ynhSEF+M9AS2AkPGWGFJnqaL8OlXIF/R1TcUA8+pK3zHw1MDtfplk wSdcAnULuQA4ECRKQiJ+PVpGFV1njsBEV1PxCeC88srChCj+7vMRMrFpRKm3lzQK79i/ szQgRcNxube8y2vZ9se4WBT6bWRyJO5/Y+tgVV/hEU72FvwmNRMEASbxqZ85eCO0Nzcj b4Vw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r6-20020a17090aad0600b0021913493ab5si521778pjq.78.2022.11.25.04.18.12; Fri, 25 Nov 2022 04:18:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229910AbiKYMRO (ORCPT + 99 others); Fri, 25 Nov 2022 07:17:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229671AbiKYMRD (ORCPT ); Fri, 25 Nov 2022 07:17:03 -0500 Received: from out30-45.freemail.mail.aliyun.com (out30-45.freemail.mail.aliyun.com [115.124.30.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3853E4A07F; Fri, 25 Nov 2022 04:16:58 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=tianjia.zhang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0VVfPn5c_1669378599; Received: from localhost(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0VVfPn5c_1669378599) by smtp.aliyun-inc.com; Fri, 25 Nov 2022 20:16:40 +0800 From: Tianjia Zhang To: Eric Biggers , "Theodore Y. Ts o" , Jaegeuk Kim , Jonathan Corbet , Jens Axboe , Ard Biesheuvel , linux-fscrypt@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Cc: Tianjia Zhang Subject: [PATCH v3 2/2] fscrypt: Add SM4 XTS/CTS symmetric algorithm support Date: Fri, 25 Nov 2022 20:16:30 +0800 Message-Id: <20221125121630.87793-3-tianjia.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20221125121630.87793-1-tianjia.zhang@linux.alibaba.com> References: <20221125121630.87793-1-tianjia.zhang@linux.alibaba.com> MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750470446331945133?= X-GMAIL-MSGID: =?utf-8?q?1750470446331945133?= SM4 is a symmetric algorithm widely used in China, and is even mandatory in many scenarios. We need to provide these users with the ability to encrypt files or disks using SM4-XTS, and many other algorithms that use SM2/3/4 algorithms or their combined algorithm scenarios, these features are demanded by many users, this patch enables to use SM4-XTS mode to encrypt file content, and use SM4-CBC-CTS to encrypt filename. Signed-off-by: Tianjia Zhang --- Documentation/filesystems/fscrypt.rst | 1 + fs/crypto/keysetup.c | 15 +++++++++++++++ fs/crypto/policy.c | 4 ++++ include/uapi/linux/fscrypt.h | 2 ++ 4 files changed, 22 insertions(+) diff --git a/Documentation/filesystems/fscrypt.rst b/Documentation/filesystems/fscrypt.rst index 5ba5817c17c2..af27e7b2c74f 100644 --- a/Documentation/filesystems/fscrypt.rst +++ b/Documentation/filesystems/fscrypt.rst @@ -336,6 +336,7 @@ Currently, the following pairs of encryption modes are supported: - AES-256-XTS for contents and AES-256-CTS-CBC for filenames - AES-128-CBC for contents and AES-128-CTS-CBC for filenames +- SM4-XTS for contents and SM4-CTS-CBC for filenames - Adiantum for both contents and filenames - AES-256-XTS for contents and AES-256-HCTR2 for filenames (v2 policies only) diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c index f7407071a952..24e55c95abc3 100644 --- a/fs/crypto/keysetup.c +++ b/fs/crypto/keysetup.c @@ -44,6 +44,21 @@ struct fscrypt_mode fscrypt_modes[] = { .security_strength = 16, .ivsize = 16, }, + [FSCRYPT_MODE_SM4_XTS] = { + .friendly_name = "SM4-XTS", + .cipher_str = "xts(sm4)", + .keysize = 32, + .security_strength = 16, + .ivsize = 16, + .blk_crypto_mode = BLK_ENCRYPTION_MODE_SM4_XTS, + }, + [FSCRYPT_MODE_SM4_CTS] = { + .friendly_name = "SM4-CTS", + .cipher_str = "cts(cbc(sm4))", + .keysize = 16, + .security_strength = 16, + .ivsize = 16, + }, [FSCRYPT_MODE_ADIANTUM] = { .friendly_name = "Adiantum", .cipher_str = "adiantum(xchacha12,aes)", diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index 46757c3052ef..8e69bc0c35cd 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -71,6 +71,10 @@ static bool fscrypt_valid_enc_modes_v1(u32 contents_mode, u32 filenames_mode) filenames_mode == FSCRYPT_MODE_AES_128_CTS) return true; + if (contents_mode == FSCRYPT_MODE_SM4_XTS && + filenames_mode == FSCRYPT_MODE_SM4_CTS) + return true; + if (contents_mode == FSCRYPT_MODE_ADIANTUM && filenames_mode == FSCRYPT_MODE_ADIANTUM) return true; diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h index a756b29afcc2..47dbd1994bfe 100644 --- a/include/uapi/linux/fscrypt.h +++ b/include/uapi/linux/fscrypt.h @@ -26,6 +26,8 @@ #define FSCRYPT_MODE_AES_256_CTS 4 #define FSCRYPT_MODE_AES_128_CBC 5 #define FSCRYPT_MODE_AES_128_CTS 6 +#define FSCRYPT_MODE_SM4_XTS 7 +#define FSCRYPT_MODE_SM4_CTS 8 #define FSCRYPT_MODE_ADIANTUM 9 #define FSCRYPT_MODE_AES_256_HCTR2 10 /* If adding a mode number > 10, update FSCRYPT_MODE_MAX in fscrypt_private.h */