From nobody Fri Jun 17 19:32:13 2022 X-Original-To: dev-commits-src-all@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 82DCA8540B2; Fri, 17 Jun 2022 19:32:14 +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 4LPq1V2FZ3z3KN4; Fri, 17 Jun 2022 19:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494334; 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=xKvZA9ComK4uX0LyL/pQ48cofSwiZkPcrmgVpywK7DM=; b=D3dbYhe0QVM0aogPROSe0ph3JMmYSQU58ZfuBw2xAb02gWH2j2Ryv8+8Qyx8Rn9p+kVA8b qh14cFTg8c83NK8MGZVQigkuMvaW4OUhs0IDhKtENFJU78kINfeyJEmNWdLpLttLNcJ80V PpjRlia0R5FxQ/OkPdH/MzzY2ztYO04hh5UoTP3fSd1bRBYQKWBn3K3bHdi5UD6MGxu7xP QEjNmKMS/Y3hPw4F9nrCW9pKnwUxc13Mf3nPUvnPkiwRPQJ/v8o3MsJ7ZA7I4CPNtBOQ32 mEKKU+G04NC/fCveYSbRqsqoe4I132LeHAMqNSeERwsKbHw/F/RMc2XAJ4M1AQ== 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 05079259B0; Fri, 17 Jun 2022 19:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJWDDW008191; Fri, 17 Jun 2022 19:32:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJWDYG008190; Fri, 17 Jun 2022 19:32:13 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:32:13 GMT Message-Id: <202206171932.25HJWDYG008190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d99bbd1f1601 - stable/13 - Add a link to the Elf_Brandinfo into the struc proc. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d99bbd1f1601bcc604058d9381793a0113450744 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494334; 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=xKvZA9ComK4uX0LyL/pQ48cofSwiZkPcrmgVpywK7DM=; b=v8/y8TFzJM4Ybft8vQI6+ihGcHv3ETm4YnMsZZG9jrxIDjlcDptYnO4DCi6ittM6Qn6nFY ukPbMUzWjbfXm/Il2oZvAYQcRfOA+UNpxuk+vfiAgp+z5d1fsyCeBtmenCzODyoS09fwBq 6eGIBP92+16shwdkfvlQ+EHffCqP8H4vCEWGEwykpwfYifAS9IokW9rCM4c/srhuxiXiaY 1H9QKbzH2r2XjDFI2MrJQAMcY1kD+psgeTZHLi4P3sjDVRJ08d3YGeTYFvp2od5/80CNTG sLN2gnFiy61YIc7mCALJ3YQQwMIpYr8wZJV9h05JOQe6otlw6CqCqUiunshNaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494334; a=rsa-sha256; cv=none; b=X1lYBnu1ky1qPB1w5SsvHRdLr+ZPqhWOim6HlAByLEFJTkA1N6lthsOYAWv2/s84me8yKn +5kzRBUTF1/+qrODd1X7FJF+iIGdeNSCtX77sUufi30qjX42chxSx6kkAvj/7pVffLEjZ/ mNdgBoZ9haOrNkbtrxBPFKR2gqJH9CxQz+hzhNHb5Fr6L0Kys6uUKhmZ+v2AfxMP1dpVl5 wKIrBdtA54/7WvDVJ3eSfQn0fdhbd1YhRpWSA2HqsLnSrnTNlU1Ajqk25zXjff9fZYBQK0 g0OHvkiGIP2y5lRnA6s4C9/aniWIvZNQ993iQ88kswMp+8xEZ3So/NveG/5vtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d99bbd1f1601bcc604058d9381793a0113450744 commit d99bbd1f1601bcc604058d9381793a0113450744 Author: Dmitry Chagin AuthorDate: 2022-06-17 19:30:26 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:30:26 +0000 Add a link to the Elf_Brandinfo into the struc proc. To allow the ABI to make a dicision based on the Brandinfo add a link to the Elf_Brandinfo into the struct proc. Add a note that the high 8 bits of Elf_Brandinfo flags is private to the ABI. Note to MFC: it breaks KBI. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D30918 MFC after: 2 weeks (cherry picked from commit 615f22b2fb6d999005473abcb771c6bf25118dfe) --- sys/kern/imgact_elf.c | 1 + sys/kern/kern_exec.c | 4 ++++ sys/kern/kern_fork.c | 1 + sys/sys/imgact_elf.h | 1 + sys/sys/proc.h | 2 ++ 5 files changed, 9 insertions(+) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index f81f565cacc9..260454e4b9f6 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1301,6 +1301,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp) error = exec_new_vmspace(imgp, sv); imgp->proc->p_sysent = sv; + imgp->proc->p_elf_brandinfo = brand_info; vmspace = imgp->proc->p_vmspace; map = &vmspace->vm_map; diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index b001c413d6e7..9dbafe52119a 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -409,6 +409,7 @@ do_execve(struct thread *td, struct image_args *args, struct mac *mac_p, #endif int error, i, orig_osrel; uint32_t orig_fctl0; + Elf_Brandinfo *orig_brandinfo; size_t freepath_size; static const char fexecv_proc_title[] = "(fexecv)"; @@ -443,6 +444,7 @@ do_execve(struct thread *td, struct image_args *args, struct mac *mac_p, oldcred = p->p_ucred; orig_osrel = p->p_osrel; orig_fctl0 = p->p_fctl0; + orig_brandinfo = p->p_elf_brandinfo; #ifdef MAC error = mac_execve_enter(imgp, mac_p); @@ -544,6 +546,7 @@ interpret: imgp->proc->p_osrel = 0; imgp->proc->p_fctl0 = 0; + imgp->proc->p_elf_brandinfo = NULL; /* * Implement image setuid/setgid. @@ -940,6 +943,7 @@ exec_fail_dealloc: if (error != 0) { p->p_osrel = orig_osrel; p->p_fctl0 = orig_fctl0; + p->p_elf_brandinfo = orig_brandinfo; } if (imgp->firstpage != NULL) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 16af36635db2..46f14e75212a 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -531,6 +531,7 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * p2->p_fd = fd; p2->p_fdtol = fdtol; p2->p_pd = pd; + p2->p_elf_brandinfo = p1->p_elf_brandinfo; if (p1->p_flag2 & P2_INHERIT_PROTECTED) { p2->p_flag |= P_PROTECTED; diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h index e721a9623af2..94a912e99167 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -91,6 +91,7 @@ typedef struct { Elf_Brandnote *brand_note; boolean_t (*header_supported)(struct image_params *, int32_t *, uint32_t *); + /* High 8 bits of flags is private to the ABI */ #define BI_CAN_EXEC_DYN 0x0001 #define BI_BRAND_NOTE 0x0002 /* May have note.ABI-tag section. */ #define BI_BRAND_NOTE_MANDATORY 0x0004 /* Must have note.ABI-tag section. */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 96bd2cc8a6ce..38675248b22d 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -725,6 +725,8 @@ struct proc { TAILQ_HEAD(, kq_timer_cb_data) p_kqtim_stop; /* (c) */ struct vnode *p_textdvp; /* (b) Dir containing textvp. */ char *p_binname; /* (b) Binary hardlink name. */ + void *p_elf_brandinfo; /* (x) Elf_Brandinfo, NULL for + non ELF binaries. */ }; #define p_session p_pgrp->pg_session