From: visa <visa@openbsd.org>
Date: Mon, 14 Nov 2022 17:25:00 +0000 (+0000)
Subject: Fix tag type and buffer limit in DT_TEXTREL lookup.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6fd9c007d7d492940c2455d08f2e9741af922547;p=openbsd

Fix tag type and buffer limit in DT_TEXTREL lookup.

OK deraadt@ kettenis@
---

diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index 01e90d05445..4657d9fe09c 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_elf.c,v 1.174 2022/11/05 10:31:16 deraadt Exp $	*/
+/*	$OpenBSD: exec_elf.c,v 1.175 2022/11/14 17:25:00 visa Exp $	*/
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -571,7 +571,7 @@ exec_elf_makecmds(struct proc *p, struct exec_package *epp)
 		 * Check if DYNAMIC contains DT_TEXTREL
 		 */
 		for (i = 0, pp = ph; i < eh->e_phnum; i++, pp++) {
-			Elf32_Dyn *dt;
+			Elf_Dyn *dt;
 			int j;
 
 			switch (pp->p_type) {
@@ -586,7 +586,7 @@ exec_elf_makecmds(struct proc *p, struct exec_package *epp)
 					free(dt, M_TEMP, pp->p_filesz);
 					break;
 				}
-				for (j = 0; j * sizeof(*dt) < pp->p_filesz; j++) {
+				for (j = 0; j < pp->p_filesz / sizeof(*dt); j++) {
 					if (dt[j].d_tag == DT_TEXTREL) {
 						textrel = VMCMD_TEXTREL;
 						break;