From f795a05e246c83d25f2d80bd9f0d96aff12b5468 Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 5 Mar 2011 23:38:40 +0000 Subject: [PATCH] Disable COMPAT_IRIX and related code. The usefulness is under discussion and code that dereferences pointer into userland without proper checking needs a full audit. --- sys/arch/sgimips/conf/GENERIC32_IP12 | 10 +++++----- sys/arch/sgimips/conf/GENERIC32_IP2x | 10 +++++----- sys/arch/sgimips/conf/GENERIC32_IP3x | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/arch/sgimips/conf/GENERIC32_IP12 b/sys/arch/sgimips/conf/GENERIC32_IP12 index 0611483b2481..97df180eb589 100644 --- a/sys/arch/sgimips/conf/GENERIC32_IP12 +++ b/sys/arch/sgimips/conf/GENERIC32_IP12 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC32_IP12,v 1.8 2010/11/23 11:14:05 hannken Exp $ +# $NetBSD: GENERIC32_IP12,v 1.9 2011/03/05 23:38:40 joerg Exp $ # # GENERIC32_IP12 machine description file # @@ -32,7 +32,7 @@ makeoptions TEXTADDR=0x80002000 # entry point options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC32-IP2x-$Revision: 1.8 $" +#ident "GENERIC32-IP2x-$Revision: 1.9 $" maxusers 32 @@ -86,7 +86,7 @@ options COMPAT_40 # NetBSD 4.0 compatibility. options COMPAT_50 # NetBSD 5.0 compatibility. #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options COMPAT_IRIX # binary compatibility with IRIX +#options COMPAT_IRIX # binary compatibility with IRIX #options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_ULTRIX # binary compatibility with Ultrix options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. @@ -283,8 +283,8 @@ pseudo-device wsfont #pseudo-device vcoda 4 # coda minicache <-> venus comm. # pseudo devices used for IRIX binary compatibility -pseudo-device irix_kmem # IRIX /dev/kmem -pseudo-device irix_usema # IRIX /dev/usema +#pseudo-device irix_kmem # IRIX /dev/kmem +#pseudo-device irix_usema # IRIX /dev/usema # Veriexec # diff --git a/sys/arch/sgimips/conf/GENERIC32_IP2x b/sys/arch/sgimips/conf/GENERIC32_IP2x index ed2c4cb1f92b..294798158268 100644 --- a/sys/arch/sgimips/conf/GENERIC32_IP2x +++ b/sys/arch/sgimips/conf/GENERIC32_IP2x @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC32_IP2x,v 1.84 2010/11/23 11:14:05 hannken Exp $ +# $NetBSD: GENERIC32_IP2x,v 1.85 2011/03/05 23:38:40 joerg Exp $ # # GENERIC32_IP2x machine description file # @@ -29,7 +29,7 @@ makeoptions TEXTADDR=0x88069000 # entry point options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC32-IP2x-$Revision: 1.84 $" +#ident "GENERIC32-IP2x-$Revision: 1.85 $" maxusers 32 @@ -86,7 +86,7 @@ options COMPAT_40 # NetBSD 4.0 compatibility. options COMPAT_50 # NetBSD 5.0 compatibility. #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options COMPAT_IRIX # binary compatibility with IRIX +#options COMPAT_IRIX # binary compatibility with IRIX options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_ULTRIX # binary compatibility with Ultrix options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. @@ -329,8 +329,8 @@ pseudo-device putter # for puffs and pud pseudo-device vcoda 4 # coda minicache <-> venus comm. # pseudo devices used for IRIX binary compatibility -pseudo-device irix_kmem # IRIX /dev/kmem -pseudo-device irix_usema # IRIX /dev/usema +#pseudo-device irix_kmem # IRIX /dev/kmem +#pseudo-device irix_usema # IRIX /dev/usema # Veriexec # diff --git a/sys/arch/sgimips/conf/GENERIC32_IP3x b/sys/arch/sgimips/conf/GENERIC32_IP3x index a46692d586a2..ce1a10953538 100644 --- a/sys/arch/sgimips/conf/GENERIC32_IP3x +++ b/sys/arch/sgimips/conf/GENERIC32_IP3x @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC32_IP3x,v 1.86 2010/11/23 11:14:05 hannken Exp $ +# $NetBSD: GENERIC32_IP3x,v 1.87 2011/03/05 23:38:40 joerg Exp $ # # GENERIC32_IP3x machine description file # @@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entry point options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC32_IP3x-$Revision: 1.86 $" +#ident "GENERIC32_IP3x-$Revision: 1.87 $" maxusers 32 @@ -79,7 +79,7 @@ options COMPAT_40 # NetBSD 4.0 compatibility. options COMPAT_50 # NetBSD 5.0 compatibility. #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options COMPAT_IRIX # binary compatibility with IRIX +#options COMPAT_IRIX # binary compatibility with IRIX options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_ULTRIX # binary compatibility with Ultrix options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. @@ -475,8 +475,8 @@ pseudo-device drvctl pseudo-device vcoda 4 # coda minicache <-> venus comm. # pseudo devices used for IRIX binary compatibility -pseudo-device irix_kmem # IRIX /dev/kmem -pseudo-device irix_usema # IRIX /dev/usema +#pseudo-device irix_kmem # IRIX /dev/kmem +#pseudo-device irix_usema # IRIX /dev/usema # Veriexec #