mirror/ELFIO
1
0
Fork 0
mirror of https://github.com/serge1/ELFIO.git synced 2025-03-20 22:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added stream_size into section

Browse Source 
This will allow to perform some security checks when reading size values
from ELF file

Fix crash e1ce7cecf01cf800397a4302854d9d76fa19763c
This commit is contained in:
alvaro 2017-07-03 22:29:19 +02:00 committed by Serge Lamikhov-Center
parent 972f89e022
commit 39f8614f17
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
elfio/elfio.hpp
View File

@ -111,11 +111,9 @@ class elfio
{ {
clean(); clean();
unsigned char e_ident[EI_NIDENT]; unsigned char e_ident[EI_NIDENT];
// Read ELF file signature
// Read ELF file signature stream.read( reinterpret_cast<char*>( &e_ident ), sizeof( e_ident ) );
stream.seekg( 0 );
stream.read( reinterpret_cast<char*>( &e_ident ), sizeof( e_ident ) );
// Is it ELF file? // Is it ELF file?
if ( stream.gcount() != sizeof( e_ident ) || if ( stream.gcount() != sizeof( e_ident ) ||
@ -132,7 +130,6 @@ class elfio
} }
convertor.setup( e_ident[EI_DATA] ); convertor.setup( e_ident[EI_DATA] );
header = create_header( e_ident[EI_CLASS], e_ident[EI_DATA] ); header = create_header( e_ident[EI_CLASS], e_ident[EI_DATA] );
if ( 0 == header ) { if ( 0 == header ) {
return false; return false;

17
elfio/elfio_section.hpp
View File

@ -46,6 +46,16 @@ class section
ELFIO_GET_SET_ACCESS_DECL( Elf_Xword, size ); ELFIO_GET_SET_ACCESS_DECL( Elf_Xword, size );
ELFIO_GET_SET_ACCESS_DECL( Elf_Word, name_string_offset ); ELFIO_GET_SET_ACCESS_DECL( Elf_Word, name_string_offset );
ELFIO_GET_ACCESS_DECL ( Elf64_Off, offset ); ELFIO_GET_ACCESS_DECL ( Elf64_Off, offset );
size_t stream_size;
const size_t get_stream_size() const
{
return stream_size;
}
void set_stream_size(size_t value)
{
stream_size = value;
}
virtual const char* get_data() const = 0; virtual const char* get_data() const = 0;
virtual void set_data( const char* pData, Elf_Word size ) = 0; virtual void set_data( const char* pData, Elf_Word size ) = 0;
@ -224,11 +234,16 @@ class section_impl : public section
std::streampos header_offset ) std::streampos header_offset )
{ {
std::fill_n( reinterpret_cast<char*>( &header ), sizeof( header ), '\0' ); std::fill_n( reinterpret_cast<char*>( &header ), sizeof( header ), '\0' );
stream.seekg ( 0, stream.end );
set_stream_size ( stream.tellg() );
stream.seekg( header_offset ); stream.seekg( header_offset );
stream.read( reinterpret_cast<char*>( &header ), sizeof( header ) ); stream.read( reinterpret_cast<char*>( &header ), sizeof( header ) );
Elf_Xword size = get_size(); Elf_Xword size = get_size();
if ( 0 == data && SHT_NULL != get_type() && SHT_NOBITS != get_type() ) { if ( 0 == data && SHT_NULL != get_type() && SHT_NOBITS != get_type() && size < get_stream_size()) {
try { try {
data = new char[size]; data = new char[size];
} catch (const std::bad_alloc&) { } catch (const std::bad_alloc&) {