jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

More checking .e_shstrndx

Browse Source 
https://github.com/upx/upx/issues/366
	modified:   p_vmlinx.cpp
This commit is contained in:
John Reiser
2020-04-15 13:44:35 -07:00
parent 910090e497
commit 67955bd2ee
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_vmlinx.cpp
+7 -2
View File
@@ -104,7 +104,6 @@ PackVmlinuxBase<T>::compare_Phdr(void const *aa, void const *bb)
template <class T> template <class T>
typename T::Shdr const *PackVmlinuxBase<T>::getElfSections() typename T::Shdr const *PackVmlinuxBase<T>::getElfSections()
{ {
Shdr const *p;
unsigned const e_shnum = ehdri.e_shnum; unsigned const e_shnum = ehdri.e_shnum;
if (ehdri.e_shentsize != sizeof(*shdri) if (ehdri.e_shentsize != sizeof(*shdri)
|| (unsigned long)file_size < ehdri.e_shoff || (unsigned long)file_size < ehdri.e_shoff
@@ -114,7 +113,13 @@ typename T::Shdr const *PackVmlinuxBase<T>::getElfSections()
shdri = new Shdr[(unsigned) e_shnum]; shdri = new Shdr[(unsigned) e_shnum];
fi->seek(ehdri.e_shoff, SEEK_SET); fi->seek(ehdri.e_shoff, SEEK_SET);
fi->readx(shdri, e_shnum * sizeof(*shdri)); fi->readx(shdri, e_shnum * sizeof(*shdri));
p = &shdri[ehdri.e_shstrndx]; // supposed unsigned const e_shstrndx = ehdri.e_shstrndx;
if (e_shnum <= e_shstrndx) {
char msg[50]; snprintf(msg, sizeof(msg),
"bad .e_shstrndx %#x", e_shstrndx);
throwCantPack(msg);
}
Shdr const *p = &shdri[e_shstrndx];
if (Shdr::SHT_STRTAB==p->sh_type if (Shdr::SHT_STRTAB==p->sh_type
&& p->sh_offset <= ((unsigned long)file_size - sizeof(*shdri)) && p->sh_offset <= ((unsigned long)file_size - sizeof(*shdri))
&& p->sh_size <= ((unsigned long)file_size - p->sh_offset) && p->sh_size <= ((unsigned long)file_size - p->sh_offset)