From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Sat, 16 Sep 2023 09:12:43 +0000 (+0100)
Subject: unsubmitted-ldso-machine-mismatch
X-Git-Tag: archive/raspbian/2.37-12+rpi1^2^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bfbdd3da4e404c89c241c12777b6abb49359ec57;p=glibc.git

unsubmitted-ldso-machine-mismatch


Gbp-Pq: Topic any
Gbp-Pq: Name unsubmitted-ldso-machine-mismatch.diff
---

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 55ca8d67a..2d741a37c 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1717,6 +1717,14 @@ open_verify (const char *name, int fd,
 	      return -1;
 	    }
 #endif
+	  else if (! __builtin_expect (elf_machine_matches_host (ehdr), 1))
+	    {
+	      /* Another non-fatal error, let's skip right past the
+	         the libraries obviously built for other machines.  */
+	      __close_nocancel (fd);
+	      __set_errno (ENOENT);
+	      return -1;
+	    }
 	  else if (ehdr->e_ident[EI_DATA] != byteorder)
 	    {
 	      if (BYTE_ORDER == BIG_ENDIAN)