Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp976141ybt; Wed, 17 Jun 2020 19:40:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtICVgc2AyrTsun/fMJSmgi+UeRfZ0sKsK9VWdma5wVoY5KhbDWAWf5smwphSco512EPCJ X-Received: by 2002:a17:906:2a41:: with SMTP id k1mr1943780eje.502.1592448005111; Wed, 17 Jun 2020 19:40:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448005; cv=none; d=google.com; s=arc-20160816; b=GZXc/TXjEvdKXTzCBPn7wnEuv9RVtjVoIVF2NK635Oro6W1YULRvJuR5JImohUXgYx wjSP/kezgPji2ZbIve+j0hI2swT43psrmBmLo+dTqsM1ejtbLzeHQVjE7D9G6coCuO46 Svxugf7qk1qPmPOlOexQNiW55SIyBxyYOlgu1ERPd/g02+YkSNlsS9MLZldnsR1PUSC5 HSu4V3ealTS5c7GBMt3iXVlEDO2c9zuwMoXc/au+AuCBHLg4Tvwhdtm3yde4BV5oAdr9 DFxOZsh2UqhKg9fNzu6YGeZJDRTF2olHTOL6k7w0PDcW1gElux7zn2RVoggHqGI0IBTS 0vPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mrXvARVbUyVudSmPULp7a/9HN75v8kgvr5kuz9AnKQE=; b=tuGBiu4FIjsjdp5bwww6POPk+i7te7NSywOrR+19vCIl9Xyp86m+KV06EUX9p3nQoi cBBVKGTstmPvHb4fVNRYpAr6D8wAVVtWx0XtZkWE9qFmdrqX3ZhTf/Lk0u8s63Scb5fS GY2s7N1/QoTfMB864RDg00O2EjjZGTyU7K72KN529iDkCQHRJAydWUTnnRLhCF9Gs+24 DECj+Ck4X2zvvN71dK89rbTCpXVd5DcUW1ZdTdLbIPzg/rEcnhQ7LSheXnpXlYv8unYi gnq/kPCDNUhkMLwUdKDRnr/e9howQPyw5LCaiIBVZooMWMG2B9n0Zkpt5i6r1+wCkLYH 3lUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VdSm98HM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z14si1051011ejr.261.2020.06.17.19.39.43; Wed, 17 Jun 2020 19:40:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VdSm98HM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729677AbgFRCiG (ORCPT + 99 others); Wed, 17 Jun 2020 22:38:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:42840 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728566AbgFRBNd (ORCPT ); Wed, 17 Jun 2020 21:13:33 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 19BC321924; Thu, 18 Jun 2020 01:13:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442812; bh=nQLIXHFy6ake7k+yX9m+vOFXRc9dhYoKUYv4HmF4pFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VdSm98HMvwqR4b8/karK2y4etu5+W/9Y+UpEraamly7CCPpozEWy4fChMAo7i/vZc 2gYq+Hjvsbsv9eirlGC7+mW0TsKM6lnXaZZZcMp2tQtkMmknFsxReoJHGrHYq2No9q IUITXw7LgX7Z+VctuAHMLbeXZLOBlOhIKjL/cvRc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe Leroy , Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.7 251/388] powerpc/kasan: Fix error detection on memory allocation Date: Wed, 17 Jun 2020 21:05:48 -0400 Message-Id: <20200618010805.600873-251-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe Leroy [ Upstream commit d132443a73d7a131775df46f33000f67ed92de1e ] In case (k_start & PAGE_MASK) doesn't equal (kstart), 'va' will never be NULL allthough 'block' is NULL Check the return of memblock_alloc() directly instead of the resulting address in the loop. Fixes: 509cd3f2b473 ("powerpc/32: Simplify KASAN init") Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/7cb8ca82042bfc45a5cfe726c921cd7e7eeb12a3.1589866984.git.christophe.leroy@csgroup.eu Signed-off-by: Sasha Levin --- arch/powerpc/mm/kasan/kasan_init_32.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/mm/kasan/kasan_init_32.c b/arch/powerpc/mm/kasan/kasan_init_32.c index cbcad369fcb2..8b15fe09b967 100644 --- a/arch/powerpc/mm/kasan/kasan_init_32.c +++ b/arch/powerpc/mm/kasan/kasan_init_32.c @@ -76,15 +76,14 @@ static int __init kasan_init_region(void *start, size_t size) return ret; block = memblock_alloc(k_end - k_start, PAGE_SIZE); + if (!block) + return -ENOMEM; for (k_cur = k_start & PAGE_MASK; k_cur < k_end; k_cur += PAGE_SIZE) { pmd_t *pmd = pmd_ptr_k(k_cur); void *va = block + k_cur - k_start; pte_t pte = pfn_pte(PHYS_PFN(__pa(va)), PAGE_KERNEL); - if (!va) - return -ENOMEM; - __set_pte_at(&init_mm, k_cur, pte_offset_kernel(pmd, k_cur), pte, 0); } flush_tlb_kernel_range(k_start, k_end); -- 2.25.1