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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 C10B5C433FF for ; Fri, 2 Aug 2019 09:50:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 89DB52086A for ; Fri, 2 Aug 2019 09:50:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739421; bh=YIuJfL9nexr+AHskL4zyzbc4OSW0mR1Fd1wyhONjbiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ebbYQ3yFCZQ9Oxm44Fcyrkam3xx4jiSL1swmDOc9kHfgK1NR6BHbUUgzF62bzSW2q ZipLaTgo4lEgDmI74pN7pZ/K9CO8A4oerbZEJBSBXGNwjjv3h/1ESUKYT1CWqIjGZ7 X54wIBSZa1j/HSQ4eQef3Ot3nCePAU/iCDjhHa2U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405615AbfHBJuU (ORCPT ); Fri, 2 Aug 2019 05:50:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:49660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392007AbfHBJps (ORCPT ); Fri, 2 Aug 2019 05:45:48 -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 C1361206A2; Fri, 2 Aug 2019 09:45:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739147; bh=YIuJfL9nexr+AHskL4zyzbc4OSW0mR1Fd1wyhONjbiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MHStNdIgifZnbdPpogKJASeTSagmNz8+mCSLCeObDOMLGLoJpcdFrf3oVE9Km8O39 vxjErQ/NJWP8Pz/uuztILUm8T7WMFQmGhx1on81RScaJUgdRBQDwU2kfynRoKVZ5eZ 3SQRuQ/qp/0MNjtAWXxXKBwUlu8Psd7Y8234ssrI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rolf Eike Beer , Helge Deller Subject: [PATCH 4.9 116/223] parisc: Ensure userspace privilege for ptraced processes in regset functions Date: Fri, 2 Aug 2019 11:35:41 +0200 Message-Id: <20190802092246.716520062@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092238.692035242@linuxfoundation.org> References: <20190802092238.692035242@linuxfoundation.org> User-Agent: quilt/0.66 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: Helge Deller commit 34c32fc603311a72cb558e5e337555434f64c27b upstream. On parisc the privilege level of a process is stored in the lowest two bits of the instruction pointers (IAOQ0 and IAOQ1). On Linux we use privilege level 0 for the kernel and privilege level 3 for user-space. So userspace should not be allowed to modify IAOQ0 or IAOQ1 of a ptraced process to change it's privilege level to e.g. 0 to try to gain kernel privileges. This patch prevents such modifications in the regset support functions by always setting the two lowest bits to one (which relates to privilege level 3 for user-space) if IAOQ0 or IAOQ1 are modified via ptrace regset calls. Link: https://bugs.gentoo.org/481768 Cc: # v4.7+ Tested-by: Rolf Eike Beer Signed-off-by: Helge Deller Signed-off-by: Greg Kroah-Hartman --- arch/parisc/kernel/ptrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/parisc/kernel/ptrace.c +++ b/arch/parisc/kernel/ptrace.c @@ -499,7 +499,8 @@ static void set_reg(struct pt_regs *regs return; case RI(iaoq[0]): case RI(iaoq[1]): - regs->iaoq[num - RI(iaoq[0])] = val; + /* set 2 lowest bits to ensure userspace privilege: */ + regs->iaoq[num - RI(iaoq[0])] = val | 3; return; case RI(sar): regs->sar = val; return;