svn commit: r361963 - stable/12/libexec/rtld-elf

[Konstantin Belousov]

Author: kib
Date: Tue Jun  9 09:04:57 2020
New Revision: 361963
URL: https://svnweb.freebsd.org/changeset/base/361963

Log:
  MFC r361725, r361728:
  Do not allow to load ET_DYN object with DF_1_PIE flag set.

Modified:
  stable/12/libexec/rtld-elf/rtld.c
  stable/12/libexec/rtld-elf/rtld.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/12/libexec/rtld-elf/rtld.c	Tue Jun  9 07:07:29 2020	(r361962)
+++ stable/12/libexec/rtld-elf/rtld.c	Tue Jun  9 09:04:57 2020	(r361963)
@@ -1321,6 +1321,8 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_D
 		    obj->z_interpose = true;
 		if (dynp->d_un.d_val & DF_1_NODEFLIB)
 		    obj->z_nodeflib = true;
+		if (dynp->d_un.d_val & DF_1_PIE)
+		    obj->z_pie = true;
 	    break;
 
 	default:
@@ -2533,6 +2535,10 @@ do_load_object(int fd, const char *name, char *path, s
     obj->path = path;
     if (!digest_dynamic(obj, 0))
 	goto errp;
+    if (obj->z_pie) {
+	_rtld_error("Cannot load PIE binary %s as DSO", obj->path);
+	goto errp;
+    }
     dbg("%s valid_hash_sysv %d valid_hash_gnu %d dynsymcount %d", obj->path,
 	obj->valid_hash_sysv, obj->valid_hash_gnu, obj->dynsymcount);
     if (obj->z_noopen && (flags & (RTLD_LO_DLOPEN | RTLD_LO_TRACE)) ==

Modified: stable/12/libexec/rtld-elf/rtld.h
==============================================================================
--- stable/12/libexec/rtld-elf/rtld.h	Tue Jun  9 07:07:29 2020	(r361962)
+++ stable/12/libexec/rtld-elf/rtld.h	Tue Jun  9 09:04:57 2020	(r361963)
@@ -258,6 +258,7 @@ typedef struct Struct_Obj_Entry {
     bool z_interpose : 1;	/* Interpose all objects but main */
     bool z_nodeflib : 1;	/* Don't search default library path */
     bool z_global : 1;		/* Make the object global */
+    bool z_pie : 1;		/* Object proclaimed itself PIE executable */
     bool static_tls : 1;	/* Needs static TLS allocation */
     bool static_tls_copied : 1;	/* Needs static TLS copying */
     bool ref_nodel : 1;		/* Refcount increased to prevent dlclose */