Align offset passed to mmap

Offset passed to mmap must be a multiple of the page size.  This patch
aligns offset passed to mmap.

	* plugin.c (get_view): Align offset passed to mmap.
This commit is contained in:
H.J. Lu 2015-02-10 05:28:26 -08:00
parent c1ee941477
commit fe9057895e
2 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,7 @@
2015-02-10 H.J. Lu <hongjiu.lu@intel.com>
* plugin.c (get_view): Align offset passed to mmap.
2015-02-08 H.J. Lu <hongjiu.lu@intel.com>
* ldfile.c (ldfile_try_open_bfd): Don't call bfd_check_format

View File

@ -499,6 +499,9 @@ get_view (const void *handle, const void **viewp)
plugin_input_file_t *input = (plugin_input_file_t *) handle;
char *buffer;
size_t size = input->filesize;
#if HAVE_GETPAGESIZE
off_t offset, bias;
#endif
ASSERT (called_plugin);
@ -520,9 +523,15 @@ get_view (const void *handle, const void **viewp)
input->view_buffer.offset = input->offset;
#if HAVE_MMAP
buffer = mmap (NULL, size, PROT_READ, MAP_PRIVATE, input->fd,
input->offset);
if (buffer == MAP_FAILED)
# if HAVE_GETPAGESIZE
bias = input->offset % getpagesize ();;
offset = input->offset - bias;
size += bias;
# endif
buffer = mmap (NULL, size, PROT_READ, MAP_PRIVATE, input->fd, offset);
if (buffer != MAP_FAILED)
buffer += bias;
else
#endif
{
char *p;