From patchwork Tue Jul 10 22:26:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu-cheng Yu X-Patchwork-Id: 10518167 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5B47E600CA for ; Tue, 10 Jul 2018 22:31:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CAC21FF7E for ; Tue, 10 Jul 2018 22:31:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40E8E212D6; Tue, 10 Jul 2018 22:31:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1D8B1FF7E for ; Tue, 10 Jul 2018 22:31:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 806536B026B; Tue, 10 Jul 2018 18:31:16 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 782BF6B026D; Tue, 10 Jul 2018 18:31:16 -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 5DE616B026C; Tue, 10 Jul 2018 18:31:16 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 0631E6B026B for ; Tue, 10 Jul 2018 18:31:16 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id t10-v6so14866976pfh.0 for ; Tue, 10 Jul 2018 15:31:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=7E6u/3CoLaE9LAEqZKlXyKmBYPaGvaDA0UWbGv0I6dA=; b=A/xNL699U5Q0vuWmGSrxXz1yU3N4lC/wYig09jF/XTVV5mqU6JfKg7gvrKFCtjQd3+ Qb56NaoQdInBAR/JusddsMFnmJC+SG3A15fhYBxktV4qWq1Up4LvoFb4rUMZYAKzgiTO VVP5cXJiwS0PkKsBlwwsm/gnnFCNuQdo52lDUWt6k7hFr7gtmq7rna4iTlT2Dekj/fdR Az0gQbdf6+k8MEgD3jO3wVW26fUVRiukud5jDDiK3B4BqhY6vHAiQPWGsDipNkcM2Qls +h1UCdGjjmkpoanEfp7YrwqHHsz42L0EjXaNjswJ9puXQLOrRBWUbTXizps+WkbGA8BN ASDw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E3jtpRlBy3PyxGBNMJOeQgQeqvKTKnUdyHeA1hHxPuE3ri9MHVk K61Ye3bJQYMVirgXiBAw4eq41tXvdC4W6uAll0evv1K3xZgJEzbKGLqIrhx3xjxU84qfhTcO+GZ 78VEDLjUTYLT6ICuFMZyoTBlTufZ6rNw2wd9vn3G2dD5BwOQDvuQcfNsR0xo85fbC0Q== X-Received: by 2002:a17:902:b586:: with SMTP id a6-v6mr26212838pls.174.1531261875729; Tue, 10 Jul 2018 15:31:15 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdsiuPnt4Wu13Q31Pdca90+GOIlpZkUUgwYpW78WESukd+0GkdhRQ23YhMQ+gOZhQupn1u9 X-Received: by 2002:a17:902:b586:: with SMTP id a6-v6mr26212805pls.174.1531261875019; Tue, 10 Jul 2018 15:31:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531261874; cv=none; d=google.com; s=arc-20160816; b=RiHtU1N5QvFmBO/V4PVMBpS2vf1NEbwfhJwRRVy5fwI4t6y156UvltIPGsZhb4SA3L A1GjBM7b5WPShn2aDB5Z4InJRXURDnby3aQM197+sl3liASPTG63wcUpG0+HUtUtWw+2 g0xiwNOaJGfHfUoGUZj5GH8xHNEzvFYogetv503MVaNvIstucUeaZnRwIX3M+mnch2ki NyVZc/GkCsC28GefzN95Y7tUkljZLEW7MZ6bF8y7FWGXmidu3t+78pJBz2jzcfdH2kVY cACVFVJVNos3wnVmw302Ot0Rc2xDkpC5RIyy3ZvSl0FiPfEZYlC17Arz3NPAJIcBKHPI d3kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=7E6u/3CoLaE9LAEqZKlXyKmBYPaGvaDA0UWbGv0I6dA=; b=EyrhFPhGmqtQtLhMXNuthjFevU+BQasoG48ko3sPomusZuLHwawpcKyEKwBL3fZOOU 5klzxV0x1iLz3ybUlol9rD2YtJHjTfsx0K4Cf+UtDB1Tv5d6RCql0iI8EO1QKWMnaWeD YCpIdJtERFLrMGKS5UJBKy9arvw9MVHAGsPb4YTx4bFeuNW/OgX/GcLfqYIZGohaqCGg xbJo3BTErr9pCYZrw39x1V8r0eKy3WU0rTfD37tU0ncLbnFhZffNYtdDvvw2ZusbjHFe OvfoaBkB52pQJYW/11l/dEADMQb+bHWubyJ1zwgMWUUjB43M8pRDdgWIIYyyGAbPs8GQ LtNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga11.intel.com (mga11.intel.com. [192.55.52.93]) by mx.google.com with ESMTPS id 31-v6si17386340plz.217.2018.07.10.15.31.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 15:31:14 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) client-ip=192.55.52.93; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2018 15:31:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,335,1526367600"; d="scan'208";a="70305420" Received: from 2b52.sc.intel.com ([143.183.136.52]) by fmsmga004.fm.intel.com with ESMTP; 10 Jul 2018 15:31:14 -0700 From: Yu-cheng Yu To: x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Cyrill Gorcunov , Dave Hansen , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , "Ravi V. Shankar" , Vedvyas Shanbhogue Cc: Yu-cheng Yu Subject: [RFC PATCH v2 15/27] mm/mprotect: Prevent mprotect from changing shadow stack Date: Tue, 10 Jul 2018 15:26:27 -0700 Message-Id: <20180710222639.8241-16-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180710222639.8241-1-yu-cheng.yu@intel.com> References: <20180710222639.8241-1-yu-cheng.yu@intel.com> 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: X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Yu-cheng Yu --- mm/mprotect.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mm/mprotect.c b/mm/mprotect.c index 625608bc8962..128dcb880c12 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -446,6 +446,15 @@ static int do_mprotect_pkey(unsigned long start, size_t len, error = -ENOMEM; if (!vma) goto out; + + /* + * Do not allow changing shadow stack memory. + */ + if (vma->vm_flags & VM_SHSTK) { + error = -EINVAL; + goto out; + } + prev = vma->vm_prev; if (unlikely(grows & PROT_GROWSDOWN)) { if (vma->vm_start >= end)