From patchwork Fri Oct 4 18:52:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 11175171 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 875D61747 for ; Fri, 4 Oct 2019 18:52:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5470F2084D for ; Fri, 4 Oct 2019 18:52:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="lVmb0L/i" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5470F2084D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8454B6B000C; Fri, 4 Oct 2019 14:52:43 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7D1278E0003; Fri, 4 Oct 2019 14:52:43 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FD3F6B000E; Fri, 4 Oct 2019 14:52:43 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0065.hostedemail.com [216.40.44.65]) by kanga.kvack.org (Postfix) with ESMTP id 3E5F06B000C for ; Fri, 4 Oct 2019 14:52:43 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id C06C24408 for ; Fri, 4 Oct 2019 18:52:42 +0000 (UTC) X-FDA: 76006998564.29.screw27_179f76457d81c X-Spam-Summary: 2,0,0,f945fe4e6ec46617,d41d8cd98f00b204,pasha.tatashin@soleen.com,:pasha.tatashin@soleen.com:jmorris@namei.org:sashal@kernel.org:ebiederm@xmission.com:kexec@lists.infradead.org:linux-kernel@vger.kernel.org:corbet@lwn.net:catalin.marinas@arm.com:will@kernel.org:linux-arm-kernel@lists.infradead.org:marc.zyngier@arm.com:james.morse@arm.com:vladimir.murzin@arm.com:matthias.bgg@gmail.com:bhsharma@redhat.com::mark.rutland@arm.com,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1381:1437:1515:1534:1541:1711:1730:1747:1777:1792:2194:2199:2393:2559:2562:2896:3138:3139:3140:3141:3142:3352:3867:3870:3871:3872:3874:4321:5007:6117:6119:6120:6261:6653:6737:7901:7903:10004:11026:11658:11914:12043:12048:12297:12438:12517:12519:12555:12679:12895:13069:13161:13229:13311:13357:13870:13894:14096:14181:14384:14394:14721:21080:21444:21451:21627:30054:30070,0,RBL:209.85.222.193:@soleen.com:.lbl8.mailshell.net-62.2.0.100 66.100.201.201,CacheIP:none,Bayesian:0.5, 0.5,0.5, X-HE-Tag: screw27_179f76457d81c X-Filterd-Recvd-Size: 4265 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Fri, 4 Oct 2019 18:52:42 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id y144so6743863qkb.7 for ; Fri, 04 Oct 2019 11:52:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=4PNhEWMnxTPqUB+Gwx2nqJhU+kkzlGq5UWgg81CPAOk=; b=lVmb0L/iZn4vml+LkXL+dphQdKWHA3ZxZOSIfHW6RdR89T1N8qbenCUryqtggxK3xI 2YWXUT+RIi3O3IPWLfEjGnZEot6UGfhyytibbPammdDaqqOHY2jSrYeeaz69WCX55zDJ ARR8UtRjp1dCiCMwHoD/kq1/FRE5CIDkp0WMatzDRfSMO3mVaWfALlnhYpfMmklovldn L+YVm/vC1fIiKHkItpf0CaL62jrrp3Mx4GvlKOg6qtSPOp29gwYIWkBObPyaPf6fFqfI cytqC/IKiibTxGr/3qe2UZdiTCHf6hQjg8u7Sm1Ig/duvtrFAuCuFXm/vwfjHnoMzJmz 640g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4PNhEWMnxTPqUB+Gwx2nqJhU+kkzlGq5UWgg81CPAOk=; b=dx1N9uLbtsEEKLdOJQZ1B4S22cXvSAb2uqr+jkjijNIC9JY5I44s87MPC51mQCCepU hEtSK2DCIAqQ39brN2n/1GhTr/mgxSqCnfc4c9Eoup4k3bOv2rHJtqBncml4UbCSkd86 dlm5wcvu9In00/cj11ChRTlxyNX5+ku3DKs7/7q/B0SbdRUHiZAbKqUmuO57t5PbQplF PmZbPE0MxjkJs7/BkQnLBTck163qfVxNbALZ/ujnZPBuMqkk33iQLkbs+I8mOb1QYwp4 Xo7ZaqBOQuZUknW5YUqBng5QdxN0UXU0+XZmnv8vDNztt0RU8R8vzqXc8BEr5PrzhZYl jXrA== X-Gm-Message-State: APjAAAXRyHr+nlPq1kUJJXOJBpK726doklwNRmHaFAuEOl/o0A0whsAG yEGj9UrlOA7E7rBHa9zwyL5h8A== X-Google-Smtp-Source: APXvYqzPH2B95+uAdwEjwo4WR65DaJB/4AKIlmg9VM3DvOImvx1M/3g1HZeOciIjj3beg2Lbibemtg== X-Received: by 2002:a37:9202:: with SMTP id u2mr11825975qkd.8.1570215161651; Fri, 04 Oct 2019 11:52:41 -0700 (PDT) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id p77sm4042514qke.6.2019.10.04.11.52.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 11:52:41 -0700 (PDT) From: Pavel Tatashin To: pasha.tatashin@soleen.com, jmorris@namei.org, sashal@kernel.org, ebiederm@xmission.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, corbet@lwn.net, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, marc.zyngier@arm.com, james.morse@arm.com, vladimir.murzin@arm.com, matthias.bgg@gmail.com, bhsharma@redhat.com, linux-mm@kvack.org, mark.rutland@arm.com Subject: [PATCH v6 03/17] arm64: hibernate: check pgd table allocation Date: Fri, 4 Oct 2019 14:52:20 -0400 Message-Id: <20191004185234.31471-4-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191004185234.31471-1-pasha.tatashin@soleen.com> References: <20191004185234.31471-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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") Signed-off-by: Pavel Tatashin --- arch/arm64/kernel/hibernate.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index d52f69462c8f..ef46ce66d7e8 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -217,6 +217,11 @@ static int create_safe_exec_page(void *src_start, size_t length, __flush_icache_range(dst, dst + length); 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);