From patchwork Wed Nov 30 08:09:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 27631 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp794104wrr; Wed, 30 Nov 2022 00:15:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf5vYCuj+4nXB/Sp7wEUIWjbImxahxMpRdBmN3mphw1EN5+nEzFxYYXu66/MOiFnWH1Z/P34 X-Received: by 2002:a63:d006:0:b0:477:41e2:6ae3 with SMTP id z6-20020a63d006000000b0047741e26ae3mr46468933pgf.142.1669796152565; Wed, 30 Nov 2022 00:15:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669796152; cv=none; d=google.com; s=arc-20160816; b=y6BgEPJOrc4qIZz28a8rgvRK90JjcGp6idr1GRLgI2WvbkUZh8eAJLWvQnUXjG73vS tqO+5M31lNFealS/BuxwzhK71iw0SpF64SoB28S/615ftrkaFKOFDtXpe/UfmymB27wX KdnkNFu+4TWm56jQozKRQryKH/nxUlVlY/2u4ySSD/hL8nSqh2YHirzcAA7UFPLyrORS Oq2qyPq6Gm8ehGvZL7+JMdB6oeMYB+eIPRkpim8TTeeCu1PjsDNwFZvnXFYAKWBWyWAk 5UeAq6UQru/44MwM3CvyeuOlmYDCKdet/UDWeLwd63Rcalpd7/4BBvXkhjciAQYcX48g BprQ== 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=Y6YxjDx500LPvls/LDWPyqhjaUTeXlnIQ+XPIGkP2TE=; b=JyLIOhvzXohvdyC4sxtqvrAv5q5A5qlJHGDLm33iry0+jrDJ0kIMSDYrC3+DjejiVB ndMQYb1rODGmhan45Z4xRIW/MsmjeuPFvBD2YCLjPKRP4XI4iGPQIzY8aoJbdRHvwJzt 6KSr8b5C/QOfIp+tcLlvDayVtRRRdls485JdluPFWHG0Yn0oA4oNO+FDp+bnlJPc+X0K BI7Q9TeOdQj6P5bHQoMGEtTdWriCmfuN4B5nPaf1mX1Axrlu36g1Ylf5lazNvaV2qcbq up+4vRVxOSiQgjzd0GvwJ8nkeymraXjhwpWvWsCyDHrq7skWu3ufcisEOhRjbHLPd4My 1n5w== 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 qi16-20020a17090b275000b00205f1a25a31si946324pjb.161.2022.11.30.00.15.39; Wed, 30 Nov 2022 00:15:52 -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 S234360AbiK3IJo (ORCPT + 99 others); Wed, 30 Nov 2022 03:09:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229613AbiK3IJn (ORCPT ); Wed, 30 Nov 2022 03:09:43 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9B516598 for ; Wed, 30 Nov 2022 00:09:42 -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 4NMX1K4Lmhz4xVnd; Wed, 30 Nov 2022 16:09:41 +0800 (CST) Received: from szxlzmapp02.zte.com.cn ([10.5.231.79]) by mse-fl2.zte.com.cn with SMTP id 2AU89YZ2031869; Wed, 30 Nov 2022 16:09:34 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp02[null]) by mapi (Zmail) with MAPI id mid14; Wed, 30 Nov 2022 16:09:36 +0800 (CST) Date: Wed, 30 Nov 2022 16:09:36 +0800 (CST) X-Zmail-TransId: 2b0463870fc0ffffffffcbc4aed9 X-Mailer: Zmail v1.0 Message-ID: <202211301609369309377@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_tracing=3A_replace_strncpy=28=29_w?= =?utf-8?q?ith_strscpy=28=29?= X-MAIL: mse-fl2.zte.com.cn 2AU89YZ2031869 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 63870FC5.000 by FangMail milter! X-FangMail-Envelope: 1669795781/4NMX1K4Lmhz4xVnd/63870FC5.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63870FC5.000/4NMX1K4Lmhz4xVnd 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?1750908170709957967?= X-GMAIL-MSGID: =?utf-8?q?1750908170709957967?= 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 --- kernel/trace/trace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 93a75a97118f..d6d2228eb67d 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -189,7 +189,7 @@ static bool snapshot_at_boot; static int __init set_cmdline_ftrace(char *str) { - strlcpy(bootup_tracer_buf, str, MAX_TRACER_SIZE); + strscpy(bootup_tracer_buf, str, MAX_TRACER_SIZE); default_bootup_tracer = bootup_tracer_buf; /* We are using ftrace early, expand it */ ring_buffer_expanded = true; @@ -244,7 +244,7 @@ static char trace_boot_options_buf[MAX_TRACER_SIZE] __initdata; static int __init set_trace_boot_options(char *str) { - strlcpy(trace_boot_options_buf, str, MAX_TRACER_SIZE); + strscpy(trace_boot_options_buf, str, MAX_TRACER_SIZE); return 1; } __setup("trace_options=", set_trace_boot_options); @@ -254,7 +254,7 @@ static char *trace_boot_clock __initdata; static int __init set_trace_boot_clock(char *str) { - strlcpy(trace_boot_clock_buf, str, MAX_TRACER_SIZE); + strscpy(trace_boot_clock_buf, str, MAX_TRACER_SIZE); trace_boot_clock = trace_boot_clock_buf; return 1; } @@ -2476,7 +2476,7 @@ static void __trace_find_cmdline(int pid, char comm[]) if (map != NO_CMDLINE_MAP) { tpid = savedcmd->map_cmdline_to_pid[map]; if (tpid == pid) { - strlcpy(comm, get_saved_cmdlines(map), TASK_COMM_LEN); + strscpy(comm, get_saved_cmdlines(map), TASK_COMM_LEN); return; } }