From owner-svn-src-stable@freebsd.org Sun Mar 8 21:11:51 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1BFB3276382; Sun, 8 Mar 2020 21:11:51 +0000 (UTC) (envelope-from emaste@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bDYy5lJFz4W1C; Sun, 8 Mar 2020 21:11:50 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 92258142; Sun, 8 Mar 2020 21:11:50 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 028LBoiv017477; Sun, 8 Mar 2020 21:11:50 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028LBohE017475; Sun, 8 Mar 2020 21:11:50 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003082111.028LBohE017475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 8 Mar 2020 21:11:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358783 - stable/12/usr.bin/elfdump X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/usr.bin/elfdump X-SVN-Commit-Revision: 358783 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2020 21:11:51 -0000 Author: emaste Date: Sun Mar 8 21:11:49 2020 New Revision: 358783 URL: https://svnweb.freebsd.org/changeset/base/358783 Log: MFC r340169 (brooks): elfdump: Add -E to test if a file is an ELF binary. This is intended to replace potentially unreliable checks like: file -b $1 | grep -q '^ELF ..-bit .SB executable' Modified: stable/12/usr.bin/elfdump/elfdump.1 stable/12/usr.bin/elfdump/elfdump.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/elfdump/elfdump.1 ============================================================================== --- stable/12/usr.bin/elfdump/elfdump.1 Sun Mar 8 21:10:16 2020 (r358782) +++ stable/12/usr.bin/elfdump/elfdump.1 Sun Mar 8 21:11:49 2020 (r358783) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 15, 2003 +.Dd November 5, 2018 .Dt ELFDUMP 1 .Os .Sh NAME @@ -34,7 +34,7 @@ files .Sh SYNOPSIS .Nm -.Fl a | cdeGhinprs +.Fl a | E | cdeGhinprs .Op Fl w Ar file .Ar file .Sh DESCRIPTION @@ -55,6 +55,11 @@ Dump section headers. Dump dynamic symbols. .It Fl e Dump ELF header. +.It Fl E +Return success if +.Ar file +is an ELF file and failure if it is not. +This option is exclusive with other options. .It Fl G Dump the GOT. .It Fl h Modified: stable/12/usr.bin/elfdump/elfdump.c ============================================================================== --- stable/12/usr.bin/elfdump/elfdump.c Sun Mar 8 21:10:16 2020 (r358782) +++ stable/12/usr.bin/elfdump/elfdump.c Sun Mar 8 21:11:49 2020 (r358783) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #define ED_SHDR (1<<8) #define ED_SYMTAB (1<<9) #define ED_ALL ((1<<10)-1) +#define ED_IS_ELF (1<<10) /* Exclusive with other flags */ #define elf_get_addr elf_get_quad #define elf_get_off elf_get_quad @@ -527,7 +528,7 @@ main(int ac, char **av) out = stdout; flags = 0; - while ((ch = getopt(ac, av, "acdeiGhnprsw:")) != -1) + while ((ch = getopt(ac, av, "acdEeiGhnprsw:")) != -1) switch (ch) { case 'a': flags = ED_ALL; @@ -538,6 +539,9 @@ main(int ac, char **av) case 'd': flags |= ED_DYN; break; + case 'E': + flags = ED_IS_ELF; + break; case 'e': flags |= ED_EHDR; break; @@ -575,7 +579,8 @@ main(int ac, char **av) } ac -= optind; av += optind; - if (ac == 0 || flags == 0) + if (ac == 0 || flags == 0 || ((flags & ED_IS_ELF) && + (ac != 1 || (flags & ~ED_IS_ELF) || out != stdout))) usage(); if ((fd = open(*av, O_RDONLY)) < 0 || fstat(fd, &sb) < 0) @@ -593,8 +598,12 @@ main(int ac, char **av) e = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); if (e == MAP_FAILED) err(1, NULL); - if (!IS_ELF(*(Elf32_Ehdr *)e)) + if (!IS_ELF(*(Elf32_Ehdr *)e)) { + if (flags & ED_IS_ELF) + exit(1); errx(1, "not an elf file"); + } else if (flags & ED_IS_ELF) + exit (0); phoff = elf_get_off(e, e, E_PHOFF); shoff = elf_get_off(e, e, E_SHOFF); phentsize = elf_get_quarter(e, e, E_PHENTSIZE); @@ -1270,6 +1279,7 @@ elf_get_quad(Elf32_Ehdr *e, void *base, elf_member_t m static void usage(void) { - fprintf(stderr, "usage: elfdump -a | -cdeGhinprs [-w file] file\n"); + fprintf(stderr, + "usage: elfdump -a | -E | -cdeGhinprs [-w file] file\n"); exit(1); }