Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Jul 2021 18:30:50 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 1e1d3725569f - stable/13 - loader: Don't reserve space for symbols twice.
Message-ID:  <202107161830.16GIUoUG047552@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=1e1d3725569fac88a9baeac88af8da82d00779d1

commit 1e1d3725569fac88a9baeac88af8da82d00779d1
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-07-12 21:17:05 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-07-16 18:28:45 +0000

    loader: Don't reserve space for symbols twice.
    
    The current code bumps lastaddr twice for the symbol table
    location. However, the first bump is bogus and results in wasted
    space. Remove it.
    
    PR:                     110995
    Sponsored by:           Netflix
    Differential Revision:  https://reviews.freebsd.org/D31017
    
    (cherry picked from commit 297e9f364b5aa243572ee52b1faef9b3542c1c9e)
---
 stand/common/load_elf_obj.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/stand/common/load_elf_obj.c b/stand/common/load_elf_obj.c
index 78ece02433c6..f3c84cf31368 100644
--- a/stand/common/load_elf_obj.c
+++ b/stand/common/load_elf_obj.c
@@ -282,8 +282,6 @@ __elfN(obj_loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off)
 		case SHT_SYMTAB:
 			nsym++;
 			ef->symtabindex = i;
-			shdr[i].sh_addr = (Elf_Addr)lastaddr;
-			lastaddr += shdr[i].sh_size;
 			break;
 		}
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107161830.16GIUoUG047552>