From patchwork Thu Jan 5 12:24:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 39496 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp278292wrt; Thu, 5 Jan 2023 04:35:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXvC/G9UaeHmhzbtLTOKil+7zYCXEl3LZLx4RVla+ZXiVu1IRLC0ICH8awP43DyYsuMwiodN X-Received: by 2002:a05:6402:34f:b0:461:57c1:84ea with SMTP id r15-20020a056402034f00b0046157c184eamr45619334edw.3.1672922118621; Thu, 05 Jan 2023 04:35:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672922118; cv=none; d=google.com; s=arc-20160816; b=OZMjEX79RP7SoV9RSzOWD6LKN6/5xy9jsHcvbulH2ZDfkxOATBFilmF8aATf2A8gVp w8zi/FCjRbg2JHft7plKzvaqSsjAp3VjYPW5rg0PbsdWTaiGCZ+J0/BSP6ekSIMAVVZp aomifolz9BH1IAXpD8C1gVUxsIA1TeLDNElndnZQK0pEuJzfYRSfKMZywl8AUBEHfJxI lN7z/7eBwjRdpE6Zt1Y9XOZ+8lrFlGlMN6CQMaKzoZLzhv7119p8XW7kQv+jVjYiT3sF aFgANTgfLNJsREgZbzLPwDXw/T6QkyjlXIuxxFjXfj5SgBobK/CXI33lEK9Dru7DBMxa 4hMQ== 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=WfZ/m9MQBwSpuo90iUx8JXpjoDVP8NpFAkjP7szIQeo=; b=X1YlidmftJiOElHzQ7oYqVVjIR+04iY14wslnRuGMKJ8ssv8TwKSahzrCm1D6i+O2O /LJSawp8OWG9YafRTKzBfZVCIvtxjCqNICwWnhXEaEx3G6hCWYDU67V7RrEZcdJt8rhD axvrWQ6H2eLYokIGgm+B0oXP9DHHgemPRgFOQK46I4kCG7ZGL35lV2owTLhdO432FibJ 72Lh6Hfi840vaceiU+s99k+mGVnZCiMVpH4DSACAyBnnu/Qqm4YvXnLsNzPvXIbtb4P4 7uEHS4Og0k6yfblxMCFLFpDQwpylvcjzhuqTDxGZZXa06hfW3cqIVzCZ01vWbJQt+OgK 1wig== 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 b18-20020a056402279200b0048f68044105si4275484ede.478.2023.01.05.04.34.54; Thu, 05 Jan 2023 04:35:18 -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 S233149AbjAEMYq (ORCPT + 99 others); Thu, 5 Jan 2023 07:24:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231616AbjAEMYp (ORCPT ); Thu, 5 Jan 2023 07:24:45 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B5E84E404; Thu, 5 Jan 2023 04:24:44 -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 4Nnlyy4l7hz8QrkZ; Thu, 5 Jan 2023 20:24:42 +0800 (CST) Received: from szxlzmapp06.zte.com.cn ([10.5.230.252]) by mse-fl2.zte.com.cn with SMTP id 305COVcF068055; Thu, 5 Jan 2023 20:24:31 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Thu, 5 Jan 2023 20:24:34 +0800 (CST) Date: Thu, 5 Jan 2023 20:24:34 +0800 (CST) X-Zmail-TransId: 2b0363b6c1823267991f X-Mailer: Zmail v1.0 Message-ID: <202301052024349365834@zte.com.cn> Mime-Version: 1.0 From: To: , Cc: , , , , , , , Subject: =?utf-8?q?=5BPATCH_linux-next_v3=5D_s390/zcrypt=3A_use_strscpy=28?= =?utf-8?q?=29_to_instead_of_strncpy=28=29?= X-MAIL: mse-fl2.zte.com.cn 305COVcF068055 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.137.novalocal with ID 63B6C18A.001 by FangMail milter! X-FangMail-Envelope: 1672921482/4Nnlyy4l7hz8QrkZ/63B6C18A.001/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63B6C18A.001/4Nnlyy4l7hz8QrkZ X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, 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?1754185983025557874?= X-GMAIL-MSGID: =?utf-8?q?1754185983025557874?= 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 --- chang for v3 - fix the sign-off Email address chang for v2 - match the FROM with the Email --- drivers/s390/crypto/zcrypt_api.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c index 4bf36e53fe3e..6fe05bb82c77 100644 --- a/drivers/s390/crypto/zcrypt_api.c +++ b/drivers/s390/crypto/zcrypt_api.c @@ -347,8 +347,7 @@ static ssize_t zcdn_create_store(struct class *class, int rc; char name[ZCDN_MAX_NAME]; - strncpy(name, skip_spaces(buf), sizeof(name)); - name[sizeof(name) - 1] = '\0'; + strscpy(name, skip_spaces(buf), sizeof(name)); rc = zcdn_create(strim(name)); @@ -365,8 +364,7 @@ static ssize_t zcdn_destroy_store(struct class *class, int rc; char name[ZCDN_MAX_NAME]; - strncpy(name, skip_spaces(buf), sizeof(name)); - name[sizeof(name) - 1] = '\0'; + strscpy(name, skip_spaces(buf), sizeof(name)); rc = zcdn_destroy(strim(name));