diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-07 09:55:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-07 09:55:58 -0700 |
| commit | 6e7f2eacf09811d092c1b41263108ac7fe0d089d (patch) | |
| tree | a04c5c449fc4c44a994feca4e39aade19ab4989e | |
| parent | 8c16ec94dc767a4d8c48149d646e8c835512cf8f (diff) | |
| parent | 027d0c7101f50cf03aeea9eebf484afd4920c8d3 (diff) | |
| download | printk-6e7f2eacf09811d092c1b41263108ac7fe0d089d.tar.gz | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas:
"Avoid potential NULL dereference in huge_pte_alloc() on pmd_alloc()
failure"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: hugetlb: avoid potential NULL dereference
| -rw-r--r-- | arch/arm64/mm/hugetlbpage.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index bbeb6a5a6ba6d..0be3355e34997 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -230,6 +230,8 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, ptep = (pte_t *)pudp; } else if (sz == (CONT_PTE_SIZE)) { pmdp = pmd_alloc(mm, pudp, addr); + if (!pmdp) + return NULL; WARN_ON(addr & (sz - 1)); /* |