Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2250699imm; Thu, 7 Jun 2018 07:42:59 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKjtKJlwBS4h/aN24fPbuH2ZVwT7vUMKh0cSsmAJ3jLudY/5ZRNQCN8CfPnvvL8D8bDIWjn X-Received: by 2002:a17:902:82cc:: with SMTP id u12-v6mr2324278plz.83.1528382579700; Thu, 07 Jun 2018 07:42:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528382579; cv=none; d=google.com; s=arc-20160816; b=S1aWZJ5LHm11LT6dp1i8pgAP/mquzjxXpN4orCuyhLHwZwRQJYysAuy3xj4DMMC5bl r4r3+ejIDjk6tgrho/bOVM/hXBE3KT/vtAho9ldZeX/gX2hPQWvS6qhL5PdX0OKCVaML NMyuR+aiCToAY5xN4Aco/0CZoEpwZV7gYX8WvN1mkoI2rGL8LOeyfw5qz1ClNfhnmT/F OGZHM0d/kXjmb11+HpITK2N0Soq7QQw/LM9N/E00TvLOeFgrBdGlhOF+osHy3seaASyx kEImgEOnC42qhrF8aBJAM5N4AlDx0Ay0MDJX0+Zejac9tRX2LjKGnot2670VnGJwPuQF uSLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=dXWSiahTvZtRvHQ0wwL46ulL8h8lt2YqB4AhipcEOMo=; b=IA28s/DJZ9Z03a7JEoEF7mK+dPesuenKI+1+F+WfiJe8/zm4ddiIGRSSiQlg5iuUi/ cbQ2j6SqxHui3mHi+807zA/JZ2I0XE5CijYgsqnX9HfroRJmrQlK9BVeijY2d+ns+TAM 5Bqkhl7SbvZbinQ5jKIYiP7CQwbNeDu3z5iqVuePzrJbXrbGvjdC8407p1eUZH15jgZC jHweMxP8MPah4N/JtuOPb0Ct99iNkAcS+TgcudzVToRrkQwomIiDjnczQY7gb3JUBsR/ zT0K3WLAPrBIjspSmuf+BYRvz0jH7M7epD+P4XxMiI5URQl+WSE2DkXfedI776lrOASI OHqw== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y10-v6si2679843pgq.54.2018.06.07.07.42.45; Thu, 07 Jun 2018 07:42:59 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934683AbeFGOls (ORCPT + 99 others); Thu, 7 Jun 2018 10:41:48 -0400 Received: from mga09.intel.com ([134.134.136.24]:36344 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934604AbeFGOlg (ORCPT ); Thu, 7 Jun 2018 10:41:36 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jun 2018 07:41:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,486,1520924400"; d="scan'208";a="62632648" Received: from 2b52.sc.intel.com ([143.183.136.51]) by orsmga001.jf.intel.com with ESMTP; 07 Jun 2018 07:41:33 -0700 From: Yu-cheng Yu To: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , "H.J. Lu" , Vedvyas Shanbhogue , "Ravi V. Shankar" , Dave Hansen , Andy Lutomirski , Jonathan Corbet , Oleg Nesterov , Arnd Bergmann , Mike Kravetz Cc: Yu-cheng Yu Subject: [PATCH 08/10] mm: Prevent mremap of shadow stack Date: Thu, 7 Jun 2018 07:38:05 -0700 Message-Id: <20180607143807.3611-9-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180607143807.3611-1-yu-cheng.yu@intel.com> References: <20180607143807.3611-1-yu-cheng.yu@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Yu-cheng Yu --- mm/mremap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/mremap.c b/mm/mremap.c index 049470aa1e3e..70f20edb248e 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -525,7 +525,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, unsigned long, new_addr) { struct mm_struct *mm = current->mm; - struct vm_area_struct *vma; + struct vm_area_struct *vma = find_vma(mm, addr); unsigned long ret = -EINVAL; unsigned long charged = 0; bool locked = false; @@ -533,6 +533,9 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, LIST_HEAD(uf_unmap_early); LIST_HEAD(uf_unmap); + if (vma->vm_flags & VM_SHSTK) + return ret; + if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE)) return ret; -- 2.15.1