From nobody Sat Apr 12 01:53:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZZGmc1Jn5z5sbp0; Sat, 12 Apr 2025 01:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZZGmb70Whz3CB5; Sat, 12 Apr 2025 01:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744422816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9zy+pzBcmXMuYJTc3l4MQ//CBGnqVUKos/+d3sNHg1A=; b=mdkfmCjE9yjC9QuVEbxuzTSVAguDccSMVYjrDHhPSxckus4gocGh+pQ2ACaeztWYtYDxqu S4TVhND0C+tXuLsncpO9xQ19LnTrFubYJA2r8S/+DB0K4Hh78JeS4D3N8DINpGCk3ukmQt GBq6++qC1rzzAcpI8VIgG5qTvPhCc0lLaTD2K0dkXk7r6fMfBuCylUrYOYN8NoNH4uNvZP w5X+Ongh3G8/PIyMdc6sb23AY+o2Q7S1eysPmbPy9mVg6dAjZIrdDmMitmDSyOqzteBwqZ itFqbcEARP6+725OWpBAU2UvzLMiUVBZUMQ2cJxINQ626y234uwz+OgtvjxwUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744422816; a=rsa-sha256; cv=none; b=CeAbgOw7pwOS6CFB27Ph+/NfUviiFVbz6FuWa7P3k2W1fEkkWQeZP8PolIAIUjc9RJnBBX g9DP+nZY38XdIzoqiLiy7zQ1Lw+tbKoN3aoqtdgibZPRwz+sarsZOndng0yyWNkjuLMn+i ems+8eI7CQSKkouNKESbfMjVWa5ATpO1BcbKmMDq1qAsovlXhFly3ALg0aSWMO0LgWBHFw Bb5qPYwR6ehcH4PQCmhcnHWTdtoZrs2TPFO8ijAaa14dYoc8HtzzVmh+pVdfZU1DDc3NMF PUAi8LDWyl9OYHQoVubm1RrClBDv4KfRvMCCpe2YO0lDAfKcBE3LoHT9r3Awjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744422816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9zy+pzBcmXMuYJTc3l4MQ//CBGnqVUKos/+d3sNHg1A=; b=m3K2oqrno8h9xL4luJ0N/NMuEzXNphhgfJZV/Y7cyZ4BDNUe1Y7TULNu2f58K1n7rXcurH krvb6sAlTUW5sLunQsqY1uVTbMOqMzx6ZCdCQhZVOfSNQ9IIyJ4Demhr6aj7nsgfALqZrx 0KGJ6N+AI1AwXhxIdVhTGiQ7kiYErJKDmZfcxAvOh0veHjDrMSoR7fcosbiS8JMwnJ2jae V7QDHrH7qdKFhrkMStyl3/Tb1tLT+ePkUqRtZt0DkR2ADoHZxOpJ/e8gwPLzHMv+7jlb1a 1OzDkSGnI4fMPvbzT2Pz+8zjdQOGNf5+4gPQXL+6UHtrQ4tNgXqhOgLwU1i6dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZZGmb6bsVzy0B; Sat, 12 Apr 2025 01:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53C1rZwu080320; Sat, 12 Apr 2025 01:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53C1rZRY080317; Sat, 12 Apr 2025 01:53:35 GMT (envelope-from git) Date: Sat, 12 Apr 2025 01:53:35 GMT Message-Id: <202504120153.53C1rZRY080317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 858b5e424816 - main - sys: protect the kernel build from accidental _FORTIFY_SOURCE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 858b5e4248164e58f53c81a653933b45eecadacf Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=858b5e4248164e58f53c81a653933b45eecadacf commit 858b5e4248164e58f53c81a653933b45eecadacf Author: Kyle Evans AuthorDate: 2025-04-12 01:53:27 +0000 Commit: Kyle Evans CommitDate: 2025-04-12 01:53:27 +0000 sys: protect the kernel build from accidental _FORTIFY_SOURCE Fortification is a userland feature, thus the flag makes no sense in a kernel context at the moment. Move the relevant includes that aren't already in a !_KERNEL block under a !_KERNEL condition to avoid breaking kernel/kmod builds that are catching a stray -D_FORTIFY_SOURCE in their CFLAGS. PR: 286010 Reviewed by: emaste, imp, markj Differential Revision: https://reviews.freebsd.org/D49774 --- sys/sys/random.h | 10 ++++++---- sys/sys/select.h | 2 +- sys/sys/socket.h | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/sys/random.h b/sys/sys/random.h index 67aae93630b5..254ba9451d0a 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -156,16 +156,18 @@ void random_harvest_deregister_source(enum random_entropy_source); #define random_harvest_queue_ether(a, b) do {} while (0) #endif /* defined(RANDOM_ENABLE_ETHER) */ +#else /* !_KERNEL */ + +#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 +#include +#endif + #endif /* _KERNEL */ #define GRND_NONBLOCK 0x1 #define GRND_RANDOM 0x2 #define GRND_INSECURE 0x4 -#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 -#include -#endif - __BEGIN_DECLS ssize_t getrandom(void *buf, size_t buflen, unsigned int flags); __END_DECLS diff --git a/sys/sys/select.h b/sys/sys/select.h index fefc9961d63a..691f66b5047d 100644 --- a/sys/sys/select.h +++ b/sys/sys/select.h @@ -49,7 +49,7 @@ typedef __fd_mask fd_mask; typedef __sigset_t sigset_t; #endif -#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 +#if !defined(_KERNEL) && defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #else #define __SSP_FORTIFY_LEVEL 0 diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 064da1cb95be..5e7c554c34cf 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -685,12 +685,12 @@ struct splice { #endif /* __BSD_VISIBLE */ +#ifndef _KERNEL + #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 #include #endif -#ifndef _KERNEL - #include __BEGIN_DECLS