Commit b1ab5049 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Fix possible uninitialised variable in vma merging code

Spotted by davem.  Strange that it ever worked.  Don't know why the compiler
didn't warn...
parent 530a7dbc
...@@ -432,7 +432,7 @@ static int vma_merge(struct mm_struct *mm, struct vm_area_struct *prev, ...@@ -432,7 +432,7 @@ static int vma_merge(struct mm_struct *mm, struct vm_area_struct *prev,
if (prev->vm_end == addr && if (prev->vm_end == addr &&
can_vma_merge_after(prev, vm_flags, file, pgoff)) { can_vma_merge_after(prev, vm_flags, file, pgoff)) {
struct vm_area_struct *next; struct vm_area_struct *next;
struct inode *inode = file ? file->f_dentry->d_inode : inode; struct inode *inode = file ? file->f_dentry->d_inode : NULL;
int need_up = 0; int need_up = 0;
if (unlikely(file && prev->vm_next && if (unlikely(file && prev->vm_next &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment