From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3EFF15808E for ; Sat, 30 Apr 2022 00:30:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A03AE07D4; Sat, 30 Apr 2022 00:30:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1164BE07D4 for ; Sat, 30 Apr 2022 00:30:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E37E133BEF4 for ; Sat, 30 Apr 2022 00:30:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1ED4FAA for ; Sat, 30 Apr 2022 00:30:40 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1651278621.241570c597a6878e55f3e40ea357dfb3120b7599.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/files/250.4-fortify-source-3-malloc.patch sys-apps/systemd/systemd-250.4-r1.ebuild sys-apps/systemd/systemd-250.4-r2.ebuild sys-apps/systemd/systemd-250.5-r1.ebuild sys-apps/systemd/systemd-250.5.ebuild X-VCS-Directories: sys-apps/systemd/ sys-apps/systemd/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 241570c597a6878e55f3e40ea357dfb3120b7599 X-VCS-Branch: master Date: Sat, 30 Apr 2022 00:30:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f79f30cc-40d4-4a4e-97dd-4ff2b96998c3 X-Archives-Hash: 3d752d77e043475eda7739c6af1e98b8 commit: 241570c597a6878e55f3e40ea357dfb3120b7599 Author: Sam James gentoo org> AuthorDate: Sat Apr 30 00:30:00 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 30 00:30:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=241570c5 sys-apps/systemd: drop FORTIFY_SOURCE=3 patch for now May cause runtime issues for some without using FORTIFY_SOURCE? (Not seen this myself but let's be safe.) Note that reported issue is only w/ GCC 12 anyway which is not yet released. Bug: https://bugs.gentoo.org/841770 Signed-off-by: Sam James gentoo.org> .../files/250.4-fortify-source-3-malloc.patch | 42 ---------------------- ...emd-250.4-r1.ebuild => systemd-250.4-r2.ebuild} | 1 - ...ystemd-250.5.ebuild => systemd-250.5-r1.ebuild} | 1 - 3 files changed, 44 deletions(-) diff --git a/sys-apps/systemd/files/250.4-fortify-source-3-malloc.patch b/sys-apps/systemd/files/250.4-fortify-source-3-malloc.patch deleted file mode 100644 index ed9eb80f21fa..000000000000 --- a/sys-apps/systemd/files/250.4-fortify-source-3-malloc.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://github.com/systemd/systemd/commit/0bd292567a543d124cd303f7dd61169a209cae64 - -From 0bd292567a543d124cd303f7dd61169a209cae64 Mon Sep 17 00:00:00 2001 -From: Martin Liska -Date: Thu, 31 Mar 2022 10:27:45 +0200 -Subject: [PATCH] Support -D_FORTIFY_SOURCE=3 by using - __builtin_dynamic_object_size. - -As explained in the issue, -D_FORTIFY_SOURCE=3 requires usage -of __builtin_dynamic_object_size in MALLOC_SIZEOF_SAFE macro. - -Fixes: #22801 ---- a/src/basic/alloc-util.h -+++ b/src/basic/alloc-util.h -@@ -174,13 +174,23 @@ void* greedy_realloc0(void **p, size_t need, size_t size); - * is compatible with _FORTIFY_SOURCES. If _FORTIFY_SOURCES is used many memory operations will take the - * object size as returned by __builtin_object_size() into account. Hence, let's return the smaller size of - * malloc_usable_size() and __builtin_object_size() here, so that we definitely operate in safe territory by -- * both the compiler's and libc's standards. Note that __builtin_object_size() evaluates to SIZE_MAX if the -- * size cannot be determined, hence the MIN() expression should be safe with dynamically sized memory, -- * too. Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and -+ * both the compiler's and libc's standards. Note that _FORTIFY_SOURCES=3 handles also dynamically allocated -+ * objects and thus it's safer using __builtin_dynamic_object_size if _FORTIFY_SOURCES=3 is used (#22801). -+ * Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and - * __builtin_object_size() returns SIZE_MAX too, hence we also return a sensible value of 0 in this corner - * case. */ -+ -+#if defined __has_builtin -+# if __has_builtin(__builtin_dynamic_object_size) -+# define MALLOC_SIZEOF_SAFE(x) \ -+ MIN(malloc_usable_size(x), __builtin_dynamic_object_size(x, 0)) -+# endif -+#endif -+ -+#ifndef MALLOC_SIZEOF_SAFE - #define MALLOC_SIZEOF_SAFE(x) \ - MIN(malloc_usable_size(x), __builtin_object_size(x, 0)) -+#endif - - /* Inspired by ELEMENTSOF() but operates on malloc()'ed memory areas: typesafely returns the number of items - * that fit into the specified memory block */ - diff --git a/sys-apps/systemd/systemd-250.4-r1.ebuild b/sys-apps/systemd/systemd-250.4-r2.ebuild similarity index 99% rename from sys-apps/systemd/systemd-250.4-r1.ebuild rename to sys-apps/systemd/systemd-250.4-r2.ebuild index 8b3ea6a36203..270bfe1cff71 100644 --- a/sys-apps/systemd/systemd-250.4-r1.ebuild +++ b/sys-apps/systemd/systemd-250.4-r2.ebuild @@ -244,7 +244,6 @@ src_prepare() { # Add local patches here PATCHES+=( "${FILESDIR}/250.4-random-seed-hash.patch" - "${FILESDIR}/250.4-fortify-source-3-malloc.patch" ) if ! use vanilla; then diff --git a/sys-apps/systemd/systemd-250.5.ebuild b/sys-apps/systemd/systemd-250.5-r1.ebuild similarity index 99% rename from sys-apps/systemd/systemd-250.5.ebuild rename to sys-apps/systemd/systemd-250.5-r1.ebuild index 1b51f0304d78..f5f763e60f72 100644 --- a/sys-apps/systemd/systemd-250.5.ebuild +++ b/sys-apps/systemd/systemd-250.5-r1.ebuild @@ -243,7 +243,6 @@ src_prepare() { # Add local patches here PATCHES+=( - "${FILESDIR}/250.4-fortify-source-3-malloc.patch" ) if ! use vanilla; then