diff options
| author | Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> | 2014-05-30 01:11:58 +0200 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2014-06-16 16:22:44 +0100 |
| commit | 8bc613befaec184b59bf3405e8d06fafdc209484 (patch) | |
| tree | 0ff4e68bb6f13879d00303c6731f406cf4682fc5 /arch/metag | |
| parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) | |
| download | linux-stable-8bc613befaec184b59bf3405e8d06fafdc209484.tar.gz linux-stable-8bc613befaec184b59bf3405e8d06fafdc209484.tar.bz2 linux-stable-8bc613befaec184b59bf3405e8d06fafdc209484.zip | |
metag: hugetlbpage: Remove null pointer checks that could never happen
There are inconsistent NULL checks in
hugetlb_get_unmapped_area_existing(). The last conditional block in the
loop checks vma, but vma is dereferenced after that.
Due to the checks above however (bearing in mind after_huge is either 0
or 1) vma is guaranteed not to be NULL here, so remove that part of the
check.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
[james.hogan@imgtec.com: remove brackets and expand commit message]
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Diffstat (limited to 'arch/metag')
| -rw-r--r-- | arch/metag/mm/hugetlbpage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c index 3c52fa6d0f8e..3c32075d2945 100644 --- a/arch/metag/mm/hugetlbpage.c +++ b/arch/metag/mm/hugetlbpage.c @@ -173,7 +173,7 @@ new_search: mm->context.part_huge = 0; return addr; } - if (vma && (vma->vm_flags & MAP_HUGETLB)) { + if (vma->vm_flags & MAP_HUGETLB) { /* space after a huge vma in 2nd level page table? */ if (vma->vm_end & HUGEPT_MASK) { after_huge = 1; |