From patchwork Wed Dec 28 01:38:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 37069 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1668854wrt; Tue, 27 Dec 2022 17:39:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXtnUjrRlDTuf60NB76v1MMhcDG62oV1F/MNeoM7kpy9gTgc34iNdlZQbtew6gZwR9i1Zz9w X-Received: by 2002:a05:6a20:d389:b0:af:7a4c:fb7d with SMTP id iq9-20020a056a20d38900b000af7a4cfb7dmr30372520pzb.23.1672191596787; Tue, 27 Dec 2022 17:39:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672191596; cv=none; d=google.com; s=arc-20160816; b=iD5F7xVlJV6s2xY7NcTVFemZNSR2biiv+j8o4bkQ/TsYm5H82YZm36b23ZMTHWWq22 KdirqsOxf7pPxLRmYisjuqsZA2guRPAQzGblxubq8ZWsdV8U6zzFR8YT9EkbjcJVm4Nz Vu5iuhfMfuHcwthRMz+2NhLl1WfiEHVAQpE328MuNEJ/axK3+vWTI35xkRiFt0Ioa3pH 51VpMo8qwGJ6qYCaz8XffGZpsTjwl+RvSxRmc9j7ENoX852YeUl25zr4hVYcwN2aYnbo 96m6cfc7T3ATwOObt3KTOu9FTXVnw2IRLv3euPIy8Ug1RVKgb7NJzSN2JcAEwJLjtIXC 5u7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=v9t2rlFlgs+GoyQ4GWsRNYU0tYf9eRNgfutSxSeVkdI=; b=nGKrwCKaOsSa4uev7AS7x1XQFFqpVvCuR69hfTpcrvct7yY8/EmNYggAa7Vej0vMWO R6vaNDCoAjs9nlParvqEvJsVQd9dsqLZZXWkBX9AZVKoLTXonZpYO1Owdi8033xiE4dk hm7/w4fCVw05/BiJvU8IUkWRKqjff3Nv0EPbTrIr+Fb8P6Y/4DsJIXtrBvpykRU7xbr4 Y8SHMZIteWCTwXaaJ4kivZHzM/w6YG+ff+jKalehZuDM687yr7vlz63vAlhk5sxxAQYU cfTAvuBByOhvL6uiUFJpz64RE4LNTqoqJMiveISR8xSx/Vo5AF1K7MPFXyi9ynqhwT/I LClw== 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=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q7-20020a632a07000000b0049ceafee357si329004pgq.140.2022.12.27.17.39.44; Tue, 27 Dec 2022 17:39:56 -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=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229918AbiL1Bim (ORCPT + 99 others); Tue, 27 Dec 2022 20:38:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230125AbiL1Bie (ORCPT ); Tue, 27 Dec 2022 20:38:34 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DB111F4; Tue, 27 Dec 2022 17:38:34 -0800 (PST) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4NhZ14523Lz5PkHg; Wed, 28 Dec 2022 09:38:32 +0800 (CST) Received: from szxlzmapp04.zte.com.cn ([10.5.231.166]) by mse-fl2.zte.com.cn with SMTP id 2BS1cRF9022734; Wed, 28 Dec 2022 09:38:27 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Wed, 28 Dec 2022 09:38:27 +0800 (CST) Date: Wed, 28 Dec 2022 09:38:27 +0800 (CST) X-Zmail-TransId: 2b0363ab9e13ffffffff85849134 X-Mailer: Zmail v1.0 Message-ID: <202212280938279799834@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_ecryptfs=3A_main=3A_use_strscpy=28?= =?utf-8?q?=29_to_instead_of_strncpy=28=29?= X-MAIL: mse-fl2.zte.com.cn 2BS1cRF9022734 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 63AB9E18.000 by FangMail milter! X-FangMail-Envelope: 1672191512/4NhZ14523Lz5PkHg/63AB9E18.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63AB9E18.000/4NhZ14523Lz5PkHg X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY 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?1753419975678759085?= X-GMAIL-MSGID: =?utf-8?q?1753419975678759085?= From: Xu Panda The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL-terminated strings. Signed-off-by: Xu Panda Signed-off-by: Yang Yang --- fs/ecryptfs/main.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index 2dc927ba067f..007bed5ddf6e 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c @@ -296,9 +296,8 @@ static int ecryptfs_parse_options(struct ecryptfs_sb_info *sbi, char *options, cipher_name_dst = mount_crypt_stat-> global_default_cipher_name; - strncpy(cipher_name_dst, cipher_name_src, - ECRYPTFS_MAX_CIPHER_NAME_SIZE); - cipher_name_dst[ECRYPTFS_MAX_CIPHER_NAME_SIZE] = '\0'; + strscpy(cipher_name_dst, cipher_name_src, + ECRYPTFS_MAX_CIPHER_NAME_SIZE + 1); cipher_name_set = 1; break; case ecryptfs_opt_ecryptfs_key_bytes: @@ -328,9 +327,7 @@ static int ecryptfs_parse_options(struct ecryptfs_sb_info *sbi, char *options, fnek_src = args[0].from; fnek_dst = mount_crypt_stat->global_default_fnek_sig; - strncpy(fnek_dst, fnek_src, ECRYPTFS_SIG_SIZE_HEX); - mount_crypt_stat->global_default_fnek_sig[ - ECRYPTFS_SIG_SIZE_HEX] = '\0'; + strscpy(fnek_dst, fnek_src, ECRYPTFS_SIG_SIZE_HEX + 1); rc = ecryptfs_add_global_auth_tok( mount_crypt_stat, mount_crypt_stat->global_default_fnek_sig, @@ -350,10 +347,8 @@ static int ecryptfs_parse_options(struct ecryptfs_sb_info *sbi, char *options, fn_cipher_name_src = args[0].from; fn_cipher_name_dst = mount_crypt_stat->global_default_fn_cipher_name; - strncpy(fn_cipher_name_dst, fn_cipher_name_src, - ECRYPTFS_MAX_CIPHER_NAME_SIZE); - mount_crypt_stat->global_default_fn_cipher_name[ - ECRYPTFS_MAX_CIPHER_NAME_SIZE] = '\0'; + strscpy(fn_cipher_name_dst, fn_cipher_name_src, + ECRYPTFS_MAX_CIPHER_NAME_SIZE + 1); fn_cipher_name_set = 1; break; case ecryptfs_opt_fn_cipher_key_bytes: