Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp2090407ybp; Thu, 10 Oct 2019 02:01:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqwxG7tNl20ejPIy3H7Mbq/E6h4WUBdykpc/Z9YcSGV2P/lzRki6XUaFnhb8mzkhVJ29wTSi X-Received: by 2002:a50:b5e3:: with SMTP id a90mr6885396ede.201.1570698105834; Thu, 10 Oct 2019 02:01:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570698105; cv=none; d=google.com; s=arc-20160816; b=x1JW8vnY3oFUtcqz2Tz8qASt99sRStQLUgBk+ElF4m3RPywX027I//3iU0Dnjz+0VT VlJn/Bh3t5NMgpcj4lQxKmT8UoviYMH/hmm4Xlettbc2qGieJdeXLTaltHxt9mg2j0gZ xO8cbsaCuaqCfDYRGUGy6HtduCD0Nl+X6dWJjuwQTfDESne/UUbqPXq9xfoQxd8bBBs/ R6TerBNnU2NLCMeDQsJ6WvNzOAbhLVSKOh9jT8RWRaGWskbWY2Ukrd6Aj7Ptx8RjkFyd ghPuDK92YApzjrx6Rh0cLxwJwJh11ID3fHXTJy0Ti3JPklWNg7hKDtS0g6/m5HCYMFM5 2OyA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6KhOKGMtU/b5IuZA88kgHwk4oyuXjgolDa/FZ8fSwgc=; b=BT4sD5nPC7kU99dNwoqbVAx4t6nO7g6feHeFvZsSoKTawRHvWwrfxRr01skRRsN92p M7qIHepEoCvOtsPlk4Pf/wFNAZzd5+aK3vy8iWtL+QcmOtrguK9uond/QDyYT3o7/GOn iq8ps6fRz+FPp3A2CfmL+4yXFHFRjOolx6VWE1EPVielcmdB7nVcFN+t+exqZQy44Cd2 Ku7mx1jL7313wGLLIqZHT7M/jAuSJBg5nFEM8ZXoUzxdIw10VBh1nWp9pJuEsTSyyIT4 zFXuGdkGm0vPYgep7TJ/WDOgDHMlOUL1C8R6d8TthILFGJDiqtSqFFd+Uc1gKJEshwPD kE0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="k/w3HsC7"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d19si2641871ejr.163.2019.10.10.02.01.21; Thu, 10 Oct 2019 02:01:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="k/w3HsC7"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388960AbfJJIoe (ORCPT + 99 others); Thu, 10 Oct 2019 04:44:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:49842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388944AbfJJIod (ORCPT ); Thu, 10 Oct 2019 04:44:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6433B21BE5; Thu, 10 Oct 2019 08:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570697072; bh=xrIMtIE+YhjG+enQpvDvu/NudS9247b2MyytPiXsrgQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k/w3HsC7CJzZPRHkXDTxXE3LD3wyc9C/6ch557c9D61yzI73+EBzT5k4GjzPlkXyX GdP/hvKx3neMRyvrkIOdkBDHf/JFDKc1aQMRGFVggkS3cjRS+g0vLf0eaMMj9hSH3x rq/sx3jthLZqA0OQMcL/wA01th75aUIqf9tSChmk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Leoshkevich , Vasily Gorbik Subject: [PATCH 4.19 001/114] s390/process: avoid potential reading of freed stack Date: Thu, 10 Oct 2019 10:35:08 +0200 Message-Id: <20191010083545.164292114@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191010083544.711104709@linuxfoundation.org> References: <20191010083544.711104709@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vasily Gorbik commit 8769f610fe6d473e5e8e221709c3ac402037da6c upstream. With THREAD_INFO_IN_TASK (which is selected on s390) task's stack usage is refcounted and should always be protected by get/put when touching other task's stack to avoid race conditions with task's destruction code. Fixes: d5c352cdd022 ("s390: move thread_info into task_struct") Cc: stable@vger.kernel.org # v4.10+ Acked-by: Ilya Leoshkevich Signed-off-by: Vasily Gorbik Signed-off-by: Greg Kroah-Hartman --- arch/s390/kernel/process.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c @@ -183,20 +183,30 @@ unsigned long get_wchan(struct task_stru if (!p || p == current || p->state == TASK_RUNNING || !task_stack_page(p)) return 0; + + if (!try_get_task_stack(p)) + return 0; + low = task_stack_page(p); high = (struct stack_frame *) task_pt_regs(p); sf = (struct stack_frame *) p->thread.ksp; - if (sf <= low || sf > high) - return 0; + if (sf <= low || sf > high) { + return_address = 0; + goto out; + } for (count = 0; count < 16; count++) { sf = (struct stack_frame *) sf->back_chain; - if (sf <= low || sf > high) - return 0; + if (sf <= low || sf > high) { + return_address = 0; + goto out; + } return_address = sf->gprs[8]; if (!in_sched_functions(return_address)) - return return_address; + goto out; } - return 0; +out: + put_task_stack(p); + return return_address; } unsigned long arch_align_stack(unsigned long sp)