From patchwork Thu Jan 5 14:36:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rong Tao X-Patchwork-Id: 39626 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp335796wrt; Thu, 5 Jan 2023 06:49:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXuNVhI+V8dMhvmUMw7EUPu5ZjdZ1Z3PtBzHEu31eEgaBsjnhxz1xLGb/TVwrHZEX3ytucTH X-Received: by 2002:a17:906:a186:b0:82d:e2a6:4b0d with SMTP id s6-20020a170906a18600b0082de2a64b0dmr44434759ejy.18.1672930147669; Thu, 05 Jan 2023 06:49:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672930147; cv=none; d=google.com; s=arc-20160816; b=pY1oW1gEizN0qKfj0trWK+T+zO4fJzQ2YeWjskzKR/s0pWdTS7kosk1+dBeiqle7Qp 2PQfZd10YaLs4SUZGJkvMT1Kz9rSZKAMigPA/O1XdOQaxFVacSku3yX5NFR0SRTv6uIm AZcxXzdEMF595ylD92wPs0ZH1bKz9pFFsDWenW2iLNY1Jw8Phfhh/OIIYH93Z9CcP3Op 29Tjh/6jtxvcaI9pvwXlr2Ff8wlFaDIj8NAVve4+NuS23G7YTfd2hzgp4TzgjGh5miIs tgVPiF6SABbLefzv/f4ol7xshLm+UV76zy72VJ2l6Nbogm9r12HYwzFV9zFvpZ82e+9U krmw== 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:date :subject:cc:to:from:message-id:dkim-signature; bh=3tPdRO47uzjqDz/kcaWbYMUahaQxKcrA7demosetVcM=; b=W0zO7sWoio8kwPQlTXl44hvqYWgIF5gQTh6sB41yB32wMf6PlYjHDNpWNyYsnr/wU1 ZlM3PAuHQec1k69A3fhrSTZaKDbl4wD1K6kkD+CtbY36akUzudbQwLXYvzIw81UzyjeG kr/RZE52FCxFRF1tYqAkfNZceNCWkjWYxWJSykIkhH5H9Px2b8HKvTK9gEsFRSx9s2en 9mORi+dQ0u6aKfyo76sSyfgQhIgqFM2WXoznPtq6/B4EYVTFuQa5OLgYlWsHECE/RzbD ZZZ9X2Ihy/h+GgRMJceDmuTqZCivJU5LBPzu5AoqYZ48nG/8JpRzlBzKewMzy7JtTyfn dJoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@foxmail.com header.s=s201512 header.b=Nytg0sCg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gl1-20020a1709073c8100b0084cd9dba34bsi8807970ejc.973.2023.01.05.06.48.43; Thu, 05 Jan 2023 06:49:07 -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; dkim=pass header.i=@foxmail.com header.s=s201512 header.b=Nytg0sCg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233310AbjAEOhy (ORCPT + 99 others); Thu, 5 Jan 2023 09:37:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbjAEOhw (ORCPT ); Thu, 5 Jan 2023 09:37:52 -0500 X-Greylist: delayed 68 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 05 Jan 2023 06:37:49 PST Received: from out203-205-221-209.mail.qq.com (out203-205-221-209.mail.qq.com [203.205.221.209]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFD4359337; Thu, 5 Jan 2023 06:37:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1672929467; bh=3tPdRO47uzjqDz/kcaWbYMUahaQxKcrA7demosetVcM=; h=From:To:Cc:Subject:Date; b=Nytg0sCgJ9JBlCaoTuZwG3RHCB72oHHlHRpcNieOLjkD5nzP79pz/NFihnB4r75s8 2c9GOhZ27bMWWMIwtENz4TPd607x4hKzfYWRPEr4KcHp+nEeuYMitIy6eHkXWyR3UW u36yft5+MkqPk9FLh+qsBC1AkOdXfK8SuJGgeBRw= Received: from rtoax.. ([111.199.188.149]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 92383400; Thu, 05 Jan 2023 22:36:35 +0800 X-QQ-mid: xmsmtpt1672929395tmioqcc4u Message-ID: X-QQ-XMAILINFO: MyHh0PQai9FptsYZjeGyA4xOuh2HhEr4BPPfP44xe/bb/TVbOgidXF62o1O4I7 LAtNMi/1Hg7Y0HP8Ne/MEc8nF5IzSU3Ben/9WWffdHB4cNn5YNHy3BnUPoI0dk8p24/bBzUyKyJr d2UStuh1Ep5rqzDC4uBHmsXngjkSLyVGC46XjHLWG63ZY8kGv7JHlbaOE2FP92EA/WsN9QkooKe/ gcp5bSuavwxWqbGcDotO33swBHcnTqAmfYfLDj9ccUxugi+4gGIdSeQ0actBGDQ8NnyUmxTfhnXU W1MUb6JrF6e/NF2pHTpTqo//VhdVy/vbbfvc+0Yqt7K0gxTeKpYoZ0bfejTH0013PQDkREa1zafp ojLTbCrzKpBGaSqMMnpQA6gsZ/YAdoTTlcYv/qTnbnEDFFqcFFI6o34bU3rO0C3xOk5tf0zLfOrJ 8AwtgYAbw4ZBJl2tihHKuavLrPincuKbUljN/7iWvZ9cDcRDkTRriTsO8S9n+fOqQsqC5MFcTqGd LbAsuunhWSHQ528XstyU92wYrhUtj+uD7UynuAVdw9coHliJs3R71S02/TcUIn9amJ+Cklv5fHy/ 2pREbTVcFivh6fyN1ls4PrtrblNObWyoeRmBhiGCVahwcPm9ClsA3jR2UQRXEv6/ogp6M152YSMF 7wN/n5Bz1D9l3nblzbul0Ya55yVvCywjIEzIaNdF/PNjSHVZHYbVdzsNLkOtccjqoGNpeMyCOHey IeoY/RJtmXQxYMMsd2xNhoFPPWLW5CITuj35apGpbJtKnmxg/TrVNGXzkVPfHWV5RfXJcefH5uS4 bjFqfERw1BDTUHXJ6nEDUXzzXB2v1zOIXEimKvl+Ghwnqaf08xpOEvwiA00niwsYQTZF9xg2Km9Z yvVEdZ+veBZLRdxXv0m28g+IeJ7S/Pa++EuZQoeHPmf6ayr+DQ9V42YqrqLZr97oqb+j3OoiESwB hp7mSaaOKimFWRC/pb3H+vAW2tWtW2 From: Rong Tao To: andrii@kernel.org Cc: rongtao@cestc.cn, Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , bpf@vger.kernel.org (open list:BPF [LIBRARY] (libbpf)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH bpf-next] libbpf: poison strlcpy() Date: Thu, 5 Jan 2023 22:36:33 +0800 X-OQ-MSGID: <20230105143634.119201-1-rtoax@foxmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, HELO_DYNAMIC_IPADDR,RCVD_IN_DNSWL_NONE,RDNS_DYNAMIC,SPF_HELO_NONE, SPF_PASS autolearn=no 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?1754194402320417966?= X-GMAIL-MSGID: =?utf-8?q?1754194402320417966?= From: Rong Tao Since commit 9fc205b413b3("libbpf: Add sane strncpy alternative and use it internally") introduce libbpf_strlcpy(), thus add strlcpy() to a poison list to prevent accidental use of it. Signed-off-by: Rong Tao Acked-by: Stanislav Fomichev --- tools/lib/bpf/libbpf_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h index 377642ff51fc..2d26ded383ca 100644 --- a/tools/lib/bpf/libbpf_internal.h +++ b/tools/lib/bpf/libbpf_internal.h @@ -20,8 +20,8 @@ /* make sure libbpf doesn't use kernel-only integer typedefs */ #pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64 -/* prevent accidental re-addition of reallocarray() */ -#pragma GCC poison reallocarray +/* prevent accidental re-addition of reallocarray()/strlcpy() */ +#pragma GCC poison reallocarray strlcpy #include "libbpf.h" #include "btf.h"