From patchwork Fri Apr 30 05:59:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12232535 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9900DC433ED for ; Fri, 30 Apr 2021 05:59:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 490E661481 for ; Fri, 30 Apr 2021 05:59:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 490E661481 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6365C940021; Fri, 30 Apr 2021 01:59:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EE9E8D000B; Fri, 30 Apr 2021 01:59:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20E2F940021; Fri, 30 Apr 2021 01:59:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0063.hostedemail.com [216.40.44.63]) by kanga.kvack.org (Postfix) with ESMTP id EE9708D000B for ; Fri, 30 Apr 2021 01:59:44 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B23F02496 for ; Fri, 30 Apr 2021 05:59:44 +0000 (UTC) X-FDA: 78087981888.06.BFA7E74 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf27.hostedemail.com (Postfix) with ESMTP id 0F83980192EF for ; Fri, 30 Apr 2021 05:59:19 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 680B06147D; Fri, 30 Apr 2021 05:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1619762383; bh=5Q24tDluCQgxazCjDcNMK6jUba2DTu2AgyHldKu/t34=; h=Date:From:To:Subject:In-Reply-To:From; b=tlElwkUvzqn/UeguRviMpV7Olj2O0ZLE6x04purbfObD/wb/oKhRqBMI6EApp33AL 2aHURmJa2QXzYZQ0wtw74+AiFX6+ySVjZ7r5sIyFH2tK5kaeDI/PiEzOa+O1a2x1es wvKbHLu7nOh3YtQpJ3woO09jTrsmqtkPp6NyvloE= Date: Thu, 29 Apr 2021 22:59:43 -0700 From: Andrew Morton To: akpm@linux-foundation.org, andreyknvl@gmail.com, daizhiyuan@phytium.com.cn, glider@google.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 127/178] mm/kasan: switch from strlcpy to strscpy Message-ID: <20210430055943.-GxILSAQQ%akpm@linux-foundation.org> In-Reply-To: <20210429225251.02b6386d21b69255b4f6c163@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Stat-Signature: 1xicz5jf3b7jyka7uhkjdegeticamtry X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 0F83980192EF Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=tlElwkUv; spf=pass (imf27.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none Received-SPF: none (linux-foundation.org>: No applicable sender policy available) receiver=imf27; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619762359-126331 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Zhiyuan Dai Subject: mm/kasan: switch from strlcpy to strscpy strlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string. Link: https://lkml.kernel.org/r/1613970647-23272-1-git-send-email-daizhiyuan@phytium.com.cn Signed-off-by: Zhiyuan Dai Acked-by: Alexander Potapenko Reviewed-by: Andrey Konovalov Signed-off-by: Andrew Morton --- mm/kasan/report_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/kasan/report_generic.c~mm-kasan-switch-from-strlcpy-to-strscpy +++ a/mm/kasan/report_generic.c @@ -148,7 +148,7 @@ static bool __must_check tokenize_frame_ } /* Copy token (+ 1 byte for '\0'). */ - strlcpy(token, *frame_descr, tok_len + 1); + strscpy(token, *frame_descr, tok_len + 1); } /* Advance frame_descr past separator. */