Skip to content

Commit 134fca9

Browse files
Jiri Kosinatorvalds
authored andcommitted
mm/mincore.c: make mincore() more conservative
The semantics of what mincore() considers to be resident is not completely clear, but Linux has always (since 2.3.52, which is when mincore() was initially done) treated it as "page is available in page cache". That's potentially a problem, as that [in]directly exposes meta-information about pagecache / memory mapping state even about memory not strictly belonging to the process executing the syscall, opening possibilities for sidechannel attacks. Change the semantics of mincore() so that it only reveals pagecache information for non-anonymous mappings that belog to files that the calling process could (if it tried to) successfully open for writing; otherwise we'd be including shared non-exclusive mappings, which - is the sidechannel - is not the usecase for mincore(), as that's primarily used for data, not (shared) text [[email protected]: v2] Link: http://lkml.kernel.org/r/[email protected] [[email protected]: restructure can_do_mincore() conditions] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Vlastimil Babka <[email protected]> Acked-by: Josh Snyder <[email protected]> Acked-by: Michal Hocko <[email protected]> Originally-by: Linus Torvalds <[email protected]> Originally-by: Dominique Martinet <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Dave Chinner <[email protected]> Cc: Kevin Easton <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Cyril Hrubis <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Kirill A. Shutemov <[email protected]> Cc: Daniel Gruss <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 97500a4 commit 134fca9

File tree

1 file changed

+22
-1
lines changed

1 file changed

+22
-1
lines changed

mm/mincore.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,22 @@ static int mincore_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
169169
return 0;
170170
}
171171

172+
static inline bool can_do_mincore(struct vm_area_struct *vma)
173+
{
174+
if (vma_is_anonymous(vma))
175+
return true;
176+
if (!vma->vm_file)
177+
return false;
178+
/*
179+
* Reveal pagecache information only for non-anonymous mappings that
180+
* correspond to the files the calling process could (if tried) open
181+
* for writing; otherwise we'd be including shared non-exclusive
182+
* mappings, which opens a side channel.
183+
*/
184+
return inode_owner_or_capable(file_inode(vma->vm_file)) ||
185+
inode_permission(file_inode(vma->vm_file), MAY_WRITE) == 0;
186+
}
187+
172188
/*
173189
* Do a chunk of "sys_mincore()". We've already checked
174190
* all the arguments, we hold the mmap semaphore: we should
@@ -189,8 +205,13 @@ static long do_mincore(unsigned long addr, unsigned long pages, unsigned char *v
189205
vma = find_vma(current->mm, addr);
190206
if (!vma || addr < vma->vm_start)
191207
return -ENOMEM;
192-
mincore_walk.mm = vma->vm_mm;
193208
end = min(vma->vm_end, addr + (pages << PAGE_SHIFT));
209+
if (!can_do_mincore(vma)) {
210+
unsigned long pages = DIV_ROUND_UP(end - addr, PAGE_SIZE);
211+
memset(vec, 1, pages);
212+
return pages;
213+
}
214+
mincore_walk.mm = vma->vm_mm;
194215
err = walk_page_range(addr, end, &mincore_walk);
195216
if (err < 0)
196217
return err;

0 commit comments

Comments
 (0)