From nobody Mon Mar 11 00:29:26 2024 X-Original-To: dev-commits-src-branches@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 4TtHhl1FpBz5DDDS; Mon, 11 Mar 2024 00:29:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TtHhl0Fk1z4sWp; Mon, 11 Mar 2024 00:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710116967; 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=viqM3UOmzPtIT4+SC0fDPUDM8M/QX9mDLYsQviuO1IQ=; b=n4expSy7S29GQwGeI4tw3JY1ZHz/Y/9WN1nKuPwIZERV0Dru/ANj9xiyyr1WeI2pFVponA rFZdBhcSdMHNo3f+M+x5gj/+NPeWkY3HB6yNk0J423tbolq5Bk970ElpAo55guqg8A57D8 boKMMdRJAev26PHh1CHrJmcboq+8uC19yhkApg/Z3yKotfh+4oYXgR7Z0Wv992fyWn0afB 6Pw8YaHtFBTwCQCOKt+8FOQzZqN76Tuby2G1lre4pFHMa69SDGzPPiYBPE+kBQlsbh2CqN +0xP0QRbHYWS6XwwFoj8FxGeHpT76RAxpduWd0iU8W6h8it6J83zG96L5fNznA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710116967; a=rsa-sha256; cv=none; b=DBOXPIzJoKAesUQOpj5kXPUFGbBqoP6EgLe8fQQV6GvoeSwPuaqXCJvli/0iOrn/DiGzTR Tx0W3+VbpOdoD6OrJuPOxu+5vClRN+hPnXo+7ER+xQhAtj6b2DtZayXk04Ryp6/gH74MBe q2xGKKlbQfh/bAN5dkbGP6aURJwKYEO6GTYzr1rQjZ6LMH28VL1LSc369Q1fScoBfzJdK1 umk2jM56vmjG+36ezFoRSWX4eVazcarEzn6Bgta1OQG50MRjtkmzApaZDq9We9B7wqCp6v zYoLvrPXCr1xgrSFlX/A6T6pUZxWRxhFoYzQ4j4xlQenkYUOCairm6gEqVDBMg== 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=1710116967; 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=viqM3UOmzPtIT4+SC0fDPUDM8M/QX9mDLYsQviuO1IQ=; b=qpjwX+hadY5KznDX+o3hbTyf9Y2CGoqgSLNgRik6L3KBm6rJ6zy/ZMCPCh6Dx7mlpYfhC2 WgUg1Tq+4GOqgln6DhrnEIFaUl+PMjGlm7f8bIg0yMH/jIohFMCHxScGrcMN/vGCUc5lBv WhRuHbm6a5jTfBZC56DZaB1A16z7JeRUQ5VS0OhEXM+8G+ZZrE9P4pHl6Ila0U+FEkTpsN Ah7mt6VHCpsXFqokxd1o0U+9N6yxPhnH05PB8nj4GfYDzmW7WIfgHIY6X9UsjZxJTVTCk1 xz32joAjFYMXePC+WEXDBBdEd801GFb7/LXbxdFHN7BX3KDGRxO4xViWFioTCQ== 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 4TtHhk68Zdz17J7; Mon, 11 Mar 2024 00:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42B0TQoW093892; Mon, 11 Mar 2024 00:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42B0TQww093889; Mon, 11 Mar 2024 00:29:26 GMT (envelope-from git) Date: Mon, 11 Mar 2024 00:29:26 GMT Message-Id: <202403110029.42B0TQww093889@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b5e95d17ec89 - stable/14 - posix_spawn(3): add POSIX_SPAWN_DISABLE_ASLR_NP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b5e95d17ec8958e26efe70368405e6dd18df6336 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b5e95d17ec8958e26efe70368405e6dd18df6336 commit b5e95d17ec8958e26efe70368405e6dd18df6336 Author: Konstantin Belousov AuthorDate: 2024-03-03 13:30:04 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-11 00:25:58 +0000 posix_spawn(3): add POSIX_SPAWN_DISABLE_ASLR_NP (cherry picked from commit 822042fdfca79faada89e67110b01dd9ecc05996) --- include/spawn.h | 1 + lib/libc/gen/posix_spawn.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/spawn.h b/include/spawn.h index 9643fcda5c13..a93315930954 100644 --- a/include/spawn.h +++ b/include/spawn.h @@ -59,6 +59,7 @@ typedef struct __posix_spawn_file_actions *posix_spawn_file_actions_t; #define POSIX_SPAWN_SETSCHEDULER 0x08 #define POSIX_SPAWN_SETSIGDEF 0x10 #define POSIX_SPAWN_SETSIGMASK 0x20 +#define POSIX_SPAWN_DISABLE_ASLR_NP 0x40 __BEGIN_DECLS /* diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index 41e059cf437b..4726416f1d02 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -28,6 +28,7 @@ #include "namespace.h" #include +#include #include #include @@ -91,7 +92,7 @@ static int process_spawnattr(const posix_spawnattr_t sa) { struct sigaction sigact = { .sa_flags = 0, .sa_handler = SIG_DFL }; - int i; + int aslr, i; /* * POSIX doesn't really describe in which order everything @@ -139,6 +140,13 @@ process_spawnattr(const posix_spawnattr_t sa) } } + /* Disable ASLR. */ + if ((sa->sa_flags & POSIX_SPAWN_DISABLE_ASLR_NP) != 0) { + aslr = PROC_ASLR_FORCE_DISABLE; + if (procctl(P_PID, 0, PROC_ASLR_CTL, &aslr) != 0) + return (errno); + } + return (0); } @@ -631,7 +639,8 @@ posix_spawnattr_setflags(posix_spawnattr_t *sa, short flags) { if ((flags & ~(POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER | - POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK)) != 0) + POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK | + POSIX_SPAWN_DISABLE_ASLR_NP)) != 0) return (EINVAL); (*sa)->sa_flags = flags; return (0);