From owner-svn-src-head@freebsd.org Sun Nov 17 01:01:03 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A256B1B1EC0; Sun, 17 Nov 2019 01:01:03 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Fv0b3gMLz4BlG; Sun, 17 Nov 2019 01:01:03 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5DB749EC3; Sun, 17 Nov 2019 01:01:03 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAH113HN072395; Sun, 17 Nov 2019 01:01:03 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAH113ih072380; Sun, 17 Nov 2019 01:01:03 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201911170101.xAH113ih072380@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sun, 17 Nov 2019 01:01:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354783 - head/sys/powerpc/powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/powerpc X-SVN-Commit-Revision: 354783 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Nov 2019 01:01:03 -0000 Author: jhibbits Date: Sun Nov 17 01:01:02 2019 New Revision: 354783 URL: https://svnweb.freebsd.org/changeset/base/354783 Log: powerpc: Return SIGILL if DSCR does not exist in m{f,t}spr emulation Guard against programs written for one powerpc target running on another, and panicking the system due to not having the DSCR register. Modified: head/sys/powerpc/powerpc/exec_machdep.c Modified: head/sys/powerpc/powerpc/exec_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/exec_machdep.c Sun Nov 17 00:52:58 2019 (r354782) +++ head/sys/powerpc/powerpc/exec_machdep.c Sun Nov 17 01:01:02 2019 (r354783) @@ -1086,15 +1086,17 @@ emulate_mfspr(int spr, int reg, struct trapframe *fram td = curthread; if (spr == SPR_DSCR || spr == SPR_DSCRP) { + if (!(cpu_features2 & PPC_FEATURE2_DSCR)) + return (SIGILL); // If DSCR was never set, get the default DSCR if ((td->td_pcb->pcb_flags & PCB_CDSCR) == 0) td->td_pcb->pcb_dscr = mfspr(SPR_DSCRP); frame->fixreg[reg] = td->td_pcb->pcb_dscr; frame->srr0 += 4; - return 0; + return (0); } else - return SIGILL; + return (SIGILL); } static int @@ -1104,13 +1106,15 @@ emulate_mtspr(int spr, int reg, struct trapframe *fram td = curthread; if (spr == SPR_DSCR || spr == SPR_DSCRP) { + if (!(cpu_features2 & PPC_FEATURE2_DSCR)) + return (SIGILL); td->td_pcb->pcb_flags |= PCB_CDSCR; td->td_pcb->pcb_dscr = frame->fixreg[reg]; mtspr(SPR_DSCRP, frame->fixreg[reg]); frame->srr0 += 4; - return 0; + return (0); } else - return SIGILL; + return (SIGILL); } #define XFX 0xFC0007FF