From patchwork Sat Aug 5 06:12:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 131444 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp303333vqr; Fri, 4 Aug 2023 23:47:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6TJwJcb0AB2hTCC9ZeYN1nFV0Cu0A+CxwV2JPZu2gdHSBq+JUe6H9UJcKhtN7sA/fr9EU X-Received: by 2002:a17:906:308c:b0:99b:b398:53b6 with SMTP id 12-20020a170906308c00b0099bb39853b6mr2073763ejv.34.1691218022355; Fri, 04 Aug 2023 23:47:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691218022; cv=none; d=google.com; s=arc-20160816; b=eSB+hgwFupMwyYOz3IfcFZhdRMkwouR9+81SnQiw1EhVbkajIyeokuhJBXY5YeTPcc oImtjx3VEGl1ORfoaIW4VsvWinS3fvE+QEsu/+ORLErCZzRb5qEBc8743vJrCiY8ErLA svsYW7qALyRO0r9JsUUnCKrjzuRrM13klVxamuQLhIa/QHuSPmYGxqyPjqSzfY1+t43m XrqnwEbE62/x7rc9zNJdKCdlfwErHg4uFjoPt1jfxgFBWRvBws6ZYtXP805sfMmlgXtT JxsF8lAMsQLEvJ18mJc1oQq+my/76Pyg7B+6yw5uTrK7j5PXcm7uxSzSlEwiEE04dg38 kT+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=ahLGGUNcbw1aylRCL51PWNGpWHd7inokv1/JAfLlRw8=; fh=AzeD7YCzxWA+xrfgg0HiLIXeOkAAMHglNTjKdDLJwsU=; b=lzzrbin+XU2r3poMmHwtHxsbGbS13WbVcgQ4PJJ01xLPAMHhP7uqeNFVItOlvpblYU UCCZuq5NHceal+vqd8yDbmZNlzbozVPmyR99+MXfNW9EBFrr38MTkh6/k7Hgsbp1aGbA ywd+bAAtJPUxmB8DiAgHDaeSqTNCsomxBZk7ATbirbFAEEJioHegVPL+uyZvRPoCfRPT GVt9CDQYFOzBKc7+BuOaI4MgqtBiW9U9ujBqpLCHm6WXBzHcHI46PCemldN1f82iIIrn C90tPYtb8TBCwws0QlbRNOlnIyzd2FC1sEAWMReeDSPl1FW5KMy8z6qkMTrVe84uZG9u l9Ew== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t8-20020a170906064800b0099845f657a8si2605072ejb.616.2023.08.04.23.46.38; Fri, 04 Aug 2023 23:47:02 -0700 (PDT) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229717AbjHEGMW (ORCPT + 99 others); Sat, 5 Aug 2023 02:12:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjHEGMU (ORCPT ); Sat, 5 Aug 2023 02:12:20 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.65.254]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B35F64ED7; Fri, 4 Aug 2023 23:12:18 -0700 (PDT) X-QQ-mid: bizesmtp62t1691215929tog00vde Received: from linux-lab-host.localdomain ( [116.30.131.233]) by bizesmtp.qq.com (ESMTP) with id ; Sat, 05 Aug 2023 14:12:07 +0800 (CST) X-QQ-SSF: 01200000000000E0X000000A0000000 X-QQ-FEAT: SFhf6fKhx/8agEErdMFhc7b3CoQDfYYa64dUygiIKK6bfOZW6eaO50gmvgSkJ OB2wiuG3XUXSphcBxzDQxJ8KvWYDUBOCG/qoCQhBDcxqxE/86kdeVcccD8qpUqs15yjeJzZ exjvN/l5mh7xTgDXFe/PzeMYPSNntJp8E4l9XUXxt+6KIwfohSXa8LlMLWBQrQe5+YvQWr4 HKdVPxT5hcEAwPGdjf8HubUIfTFKdxHSfAGChvwOPFs0XUk7l/iBSC5psv5GkI9Z+cI1yxc 9Wu+MJ5k2GW5hkmk0Zvbxi2wgOK5CHoZV3Knytk3+cGpEbkXcYRgQG4eHY64SDUI0DyGccD nhNSMAqRrd0rn376xf0rcC+l9pWB7sFcEuTc3fjAbe+9u2CcbprXWHT0bGe4c62rPAherny X-QQ-GoodBg: 0 X-BIZMAIL-ID: 1579897849559597880 From: Zhangjin Wu To: thomas@t-8ch.de, w@1wt.eu Cc: falcon@tinylab.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Subject: [PATCH v2 2/3] tools/nolibc: stackprotector.h: make __stack_chk_init static Date: Sat, 5 Aug 2023 14:12:06 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-1 X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL, 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: INBOX X-GMAIL-THRID: 1773370628954681367 X-GMAIL-MSGID: 1773370628954681367 This allows to generate smaller text/data/dec size. As the _start_c() function added by crt.h, __stack_chk_init() is called from _start_c() instead of the assembly _start. So, it is able to mark it with static now. Reviewed-by: Thomas Weißschuh Signed-off-by: Zhangjin Wu --- tools/include/nolibc/crt.h | 2 +- tools/include/nolibc/stackprotector.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/include/nolibc/crt.h b/tools/include/nolibc/crt.h index 32e128b0fb62..a5f33fef1672 100644 --- a/tools/include/nolibc/crt.h +++ b/tools/include/nolibc/crt.h @@ -10,7 +10,7 @@ char **environ __attribute__((weak)); const unsigned long *_auxv __attribute__((weak)); -void __stack_chk_init(void); +static void __stack_chk_init(void); static void exit(int); void _start_c(long *sp) diff --git a/tools/include/nolibc/stackprotector.h b/tools/include/nolibc/stackprotector.h index b620f2b9578d..13f1d0e60387 100644 --- a/tools/include/nolibc/stackprotector.h +++ b/tools/include/nolibc/stackprotector.h @@ -37,8 +37,7 @@ void __stack_chk_fail_local(void) __attribute__((weak,section(".data.nolibc_stack_chk"))) uintptr_t __stack_chk_guard; -__attribute__((weak,section(".text.nolibc_stack_chk"))) __no_stack_protector -void __stack_chk_init(void) +static __no_stack_protector void __stack_chk_init(void) { my_syscall3(__NR_getrandom, &__stack_chk_guard, sizeof(__stack_chk_guard), 0); /* a bit more randomness in case getrandom() fails, ensure the guard is never 0 */ @@ -46,7 +45,7 @@ void __stack_chk_init(void) __stack_chk_guard ^= (uintptr_t) &__stack_chk_guard; } #else /* !defined(_NOLIBC_STACKPROTECTOR) */ -__inline__ void __stack_chk_init(void) {} +static void __stack_chk_init(void) {} #endif /* defined(_NOLIBC_STACKPROTECTOR) */ #endif /* _NOLIBC_STACKPROTECTOR_H */