From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F004C43141 for ; Thu, 28 Jun 2018 16:24:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDF00272D8 for ; Thu, 28 Jun 2018 16:24:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=efficios.com header.i=@efficios.com header.b="Pb1oONSu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDF00272D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935031AbeF1QYW (ORCPT ); Thu, 28 Jun 2018 12:24:22 -0400 Received: from mail.efficios.com ([167.114.142.138]:34556 "EHLO mail.efficios.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753031AbeF1QYP (ORCPT ); Thu, 28 Jun 2018 12:24:15 -0400 Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 45A9B22E772; Thu, 28 Jun 2018 12:24:14 -0400 (EDT) Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id 2Mv4ln8skAqr; Thu, 28 Jun 2018 12:24:13 -0400 (EDT) Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 4F3E522E760; Thu, 28 Jun 2018 12:24:13 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 4F3E522E760 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1530203053; bh=L4HH6H8EI4ajM2QkUzq6NTOwxTMBzRH9P/0cprJ5dW8=; h=From:To:Date:Message-Id; b=Pb1oONSu1lvZpOSZBUyWIceRnHNmnZmMpitO+Bw+fmVx5EmhqkWd5UX+1OGeab20r dX7VJJxKdWXap9kufKoK8XrjI7KHc9YsZBNisAn1dpebOv7ggvG6Ax4/xAsDpGa++3 jNyrjHS7ZVTATzYHGZWqZyg4jb73a8ZbkSOONT7OL9wokyNUIcxvWhECxIxhBM0I74 j2pYhQzdJ9OomUWNxoJEoNZqKFBwiJ3028EOYipMQUFshp4ZC8lqK3M+2LV4/FoSY1 erIUhBDR8iV97nqKNJ/D7C6oTRlpC209X1wBMtyrtnkewZBkY+62GL+vU66k0G63r9 CVMT/hV1SmgQQ== X-Virus-Scanned: amavisd-new at efficios.com Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id hcV3V_yA1oE8; Thu, 28 Jun 2018 12:24:13 -0400 (EDT) Received: from thinkos.internal.efficios.com (192-222-157-41.qc.cable.ebox.net [192.222.157.41]) by mail.efficios.com (Postfix) with ESMTPSA id E804722E75A; Thu, 28 Jun 2018 12:24:12 -0400 (EDT) From: Mathieu Desnoyers To: Thomas Gleixner Cc: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, Peter Zijlstra , "Paul E . McKenney" , Boqun Feng , Andy Lutomirski , Dave Watson , Paul Turner , Andrew Morton , Russell King , Ingo Molnar , "H . Peter Anvin" , Andi Kleen , Chris Lameter , Ben Maurer , Steven Rostedt , Josh Triplett , Linus Torvalds , Catalin Marinas , Will Deacon , Michael Kerrisk , Joel Fernandes , Mathieu Desnoyers Subject: [RFC PATCH for 4.18 1/2] rseq: validate rseq_cs fields are < TASK_SIZE Date: Thu, 28 Jun 2018 12:23:58 -0400 Message-Id: <20180628162359.9054-1-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Validating the abort_ip field of rseq_cs ensures that the kernel don't return to an invalid address when returning to userspace after an abort. I don't fully trust each architecture code to cleanly deal with invalid return addresses. Validating the range [ start_ip, start_ip + post_commit_offset ] is an extra validation step ensuring that userspace provides valid values to describe the critical section. If validation fails, the process is killed with a segmentation fault. Change the rseq ABI so rseq_cs start_ip, post_commit_offset and abort_ip fields are seen as 64-bit fields by both 32-bit and 64-bit kernels rather that ignoring the 32 upper bits on 32-bit kernels. This ensures we have a consistent behavior for a 32-bit binary executed on 32-bit kernels and in compat mode on 64-bit kernels. Signed-off-by: Mathieu Desnoyers CC: "Paul E. McKenney" CC: Peter Zijlstra CC: Paul Turner CC: Thomas Gleixner CC: Andy Lutomirski CC: Andi Kleen CC: Dave Watson CC: Chris Lameter CC: Ingo Molnar CC: "H. Peter Anvin" CC: Ben Maurer CC: Steven Rostedt CC: Josh Triplett CC: Linus Torvalds CC: Andrew Morton CC: Russell King CC: Catalin Marinas CC: Will Deacon CC: Michael Kerrisk CC: Boqun Feng CC: linux-api@vger.kernel.org --- include/uapi/linux/rseq.h | 6 +++--- kernel/rseq.c | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/uapi/linux/rseq.h b/include/uapi/linux/rseq.h index d620fa43756c..519ad6e176d1 100644 --- a/include/uapi/linux/rseq.h +++ b/include/uapi/linux/rseq.h @@ -52,10 +52,10 @@ struct rseq_cs { __u32 version; /* enum rseq_cs_flags */ __u32 flags; - LINUX_FIELD_u32_u64(start_ip); + __u64 start_ip; /* Offset from start_ip. */ - LINUX_FIELD_u32_u64(post_commit_offset); - LINUX_FIELD_u32_u64(abort_ip); + __u64 post_commit_offset; + __u64 abort_ip; } __attribute__((aligned(4 * sizeof(__u64)))); /* diff --git a/kernel/rseq.c b/kernel/rseq.c index 22b6acf1ad63..4ba582046fcd 100644 --- a/kernel/rseq.c +++ b/kernel/rseq.c @@ -128,7 +128,10 @@ static int rseq_get_rseq_cs(struct task_struct *t, struct rseq_cs *rseq_cs) return 0; } urseq_cs = (struct rseq_cs __user *)ptr; - if (copy_from_user(rseq_cs, urseq_cs, sizeof(*rseq_cs))) + if (copy_from_user(rseq_cs, urseq_cs, sizeof(*rseq_cs)) || + rseq_cs->abort_ip >= TASK_SIZE || + rseq_cs->start_ip >= TASK_SIZE || + rseq_cs->start_ip + rseq_cs->post_commit_offset >= TASK_SIZE) return -EFAULT; if (rseq_cs->version > 0) return -EINVAL; @@ -137,7 +140,7 @@ static int rseq_get_rseq_cs(struct task_struct *t, struct rseq_cs *rseq_cs) if (rseq_cs->abort_ip - rseq_cs->start_ip < rseq_cs->post_commit_offset) return -EINVAL; - usig = (u32 __user *)(rseq_cs->abort_ip - sizeof(u32)); + usig = (u32 __user *)(unsigned long)(rseq_cs->abort_ip - sizeof(u32)); ret = get_user(sig, usig); if (ret) return ret; -- 2.11.0