From 54d01790b588ffa3694f22a43fbb2cd90c17f240 Mon Sep 17 00:00:00 2001 From: John Reiser Date: Fri, 20 Dec 2002 02:48:39 +0000 Subject: [PATCH] Linux 2.5.53 has some Elf32_auxv_t.a_type >= 32 committer: jreiser 1040352519 +0000 --- src/stub/fold_elf86.asm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/stub/fold_elf86.asm b/src/stub/fold_elf86.asm index 44a01c03..89593b6c 100644 --- a/src/stub/fold_elf86.asm +++ b/src/stub/fold_elf86.asm @@ -181,11 +181,14 @@ L20: ; move envp L30: ; process auxv lodsd ; a_type stosd - test eax, eax ; AT_NULL ? [flags: Zero, Sign, Parity; C=0, V=0] + cmp al, 32 + jae L32 ; prevent aliasing of 'btr' when 32<=a_type btr edx, eax ; no longer need a slot of type eax [Carry only] +L32: + test eax, eax ; AT_NULL ? [flags: Zero, Sign, Parity; C=0, V=0] lodsd stosd - jne L30 ; checks only Zero bit of flags + jnz L30 ; checks only Zero bit of flags sub edi, byte 8 ; backup to AT_NULL add ecx, ecx ; two words per auxv