diff options
| author |   Pavel Tatashin <pasha.tatashin@soleen.com> | 2019-10-14 10:48:24 -0400 |
|---|---|---|
| committer |   Will Deacon <will@kernel.org> | 2019-10-14 17:57:29 -0700 |
| commit | 8c551f919a73c1dfa690a70a691be1da394145e8 (patch) | |
| tree | 89201c9a4463d62132f376e49f423ff48e06e704 | |
| parent | arm64: cpufeature: Treat ID_AA64ZFR0_EL1 as RAZ when SVE is not enabled (diff) | |
| download | linux-dev-8c551f919a73c1dfa690a70a691be1da394145e8.tar.xz linux-dev-8c551f919a73c1dfa690a70a691be1da394145e8.zip | |
arm64: hibernate: check pgd table allocation
There is a bug in create_safe_exec_page(), when page table is allocated
it is not checked that table is allocated successfully:
But it is dereferenced in: pgd_none(READ_ONCE(*pgdp)). Check that
allocation was successful.
Fixes: 82869ac57b5d ("arm64: kernel: Add support for hibernate/suspend-to-disk")
Reviewed-by: James Morse <james.morse@arm.com>
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | arch/arm64/kernel/hibernate.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index e0a7fce0e01c..a96b2921d22c 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -201,6 +201,7 @@ static int create_safe_exec_page(void *src_start, size_t length, gfp_t mask) { int rc = 0; + pgd_t *trans_pgd; pgd_t *pgdp; pud_t *pudp; pmd_t *pmdp; @@ -215,7 +216,13 @@ static int create_safe_exec_page(void *src_start, size_t length, memcpy((void *)dst, src_start, length); __flush_icache_range(dst, dst + length); - pgdp = pgd_offset_raw(allocator(mask), dst_addr); + trans_pgd = allocator(mask); + if (!trans_pgd) { + rc = -ENOMEM; + goto out; + } + + pgdp = pgd_offset_raw(trans_pgd, dst_addr); if (pgd_none(READ_ONCE(*pgdp))) { pudp = allocator(mask); if (!pudp) { |