/proc/self/maps doesn't display the real file offset

This addresses

http://bugzilla.kernel.org/show_bug.cgi?id=11318

In function show_map (file: fs/proc/task_mmu.c), if vma->vm_pgoff > 2^20
than (vma->vm_pgoff << PAGE_SIZE) is greater than 2^32 (with PAGE_SIZE
equal to 4096 (i.e. 2^12). The next seq_printf use an unsigned long for
the conversion of (vma->vm_pgoff << PAGE_SIZE), as a result the offset
value displayed in /proc/self/maps is truncated if the page offset is
greater than 2^20.

A test that shows this issue:

#define _GNU_SOURCE
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>

#define PAGE_SIZE (getpagesize())

#if __i386__
# define U64_STR "%llx"
#elif __x86_64
# define U64_STR "%lx"
#else
# error "Architecture Unsupported"
#endif

int main(int argc, char *argv[])
{
int fd;
char *addr;
off64_t offset = 0x10000000;
char *filename = "/dev/zero";

fd = open(filename, O_RDONLY);
if (fd < 0) {
perror("open");
return 1;
}

offset *= 0x10;
printf("offset = " U64_STR "\n", offset);

addr = (char*)mmap64(NULL, PAGE_SIZE, PROT_READ, MAP_PRIVATE, fd,
offset);
if ((void*)addr == MAP_FAILED) {
perror("mmap64");
return 1;
}

{
FILE *fmaps;
char *line = NULL;
size_t len = 0;
ssize_t read;
size_t filename_len = strlen(filename);

fmaps = fopen("/proc/self/maps", "r");
if (!fmaps) {
perror("fopen");
return 1;
}
while ((read = getline(&line, &len, fmaps)) != -1) {
if ((read > filename_len + 1)
&& (strncmp(&line[read - filename_len - 1], filename, filename_len) == 0))
printf("%s", line);
}

if (line)
free(line);

fclose(fmaps);
}

close(fd);
return 0;
}

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Clement Calmels <cboulte@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Clement Calmels and committed by
Linus Torvalds
1804dc6e 35fc908d

+4 -4
+2 -2
fs/proc/nommu.c
··· 52 52 } 53 53 54 54 seq_printf(m, 55 - "%08lx-%08lx %c%c%c%c %08lx %02x:%02x %lu %n", 55 + "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", 56 56 vma->vm_start, 57 57 vma->vm_end, 58 58 flags & VM_READ ? 'r' : '-', 59 59 flags & VM_WRITE ? 'w' : '-', 60 60 flags & VM_EXEC ? 'x' : '-', 61 61 flags & VM_MAYSHARE ? flags & VM_SHARED ? 'S' : 's' : 'p', 62 - vma->vm_pgoff << PAGE_SHIFT, 62 + ((loff_t)vma->vm_pgoff) << PAGE_SHIFT, 63 63 MAJOR(dev), MINOR(dev), ino, &len); 64 64 65 65 if (file) {
+2 -2
fs/proc/task_mmu.c
··· 219 219 ino = inode->i_ino; 220 220 } 221 221 222 - seq_printf(m, "%08lx-%08lx %c%c%c%c %08lx %02x:%02x %lu %n", 222 + seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", 223 223 vma->vm_start, 224 224 vma->vm_end, 225 225 flags & VM_READ ? 'r' : '-', 226 226 flags & VM_WRITE ? 'w' : '-', 227 227 flags & VM_EXEC ? 'x' : '-', 228 228 flags & VM_MAYSHARE ? 's' : 'p', 229 - vma->vm_pgoff << PAGE_SHIFT, 229 + ((loff_t)vma->vm_pgoff) << PAGE_SHIFT, 230 230 MAJOR(dev), MINOR(dev), ino, &len); 231 231 232 232 /*