From 87449d881a8c47d47213f4f4c8d06025b44e5afd Mon Sep 17 00:00:00 2001
From: kettenis <kettenis@openbsd.org>
Date: Sun, 23 Jun 2024 22:08:37 +0000
Subject: [PATCH] If an ioctl(2) request isn't implemented we should return
 ENOTTY.

ok deraadt@
---
 sys/arch/alpha/alpha/mem.c         | 4 ++--
 sys/arch/amd64/amd64/mem.c         | 4 ++--
 sys/arch/arm/arm/mem.c             | 4 ++--
 sys/arch/arm64/arm64/mem.c         | 4 ++--
 sys/arch/hppa/hppa/mem.c           | 4 ++--
 sys/arch/i386/i386/mem.c           | 4 ++--
 sys/arch/m88k/m88k/mem.c           | 4 ++--
 sys/arch/macppc/macppc/mem.c       | 4 ++--
 sys/arch/mips64/mips64/mem.c       | 4 ++--
 sys/arch/powerpc64/powerpc64/mem.c | 4 ++--
 sys/arch/riscv64/riscv64/mem.c     | 4 ++--
 sys/arch/sh/sh/mem.c               | 4 ++--
 sys/arch/sparc64/sparc64/mem.c     | 5 ++---
 13 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/sys/arch/alpha/alpha/mem.c b/sys/arch/alpha/alpha/mem.c
index 290ff9cccd8..42e9f48d50e 100644
--- a/sys/arch/alpha/alpha/mem.c
+++ b/sys/arch/alpha/alpha/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.34 2018/02/19 08:59:52 mpi Exp $ */
+/* $OpenBSD: mem.c,v 1.35 2024/06/23 22:08:37 kettenis Exp $ */
 /* $NetBSD: mem.c,v 1.26 2000/03/29 03:48:20 simonb Exp $ */
 
 /*
@@ -250,5 +250,5 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 		return 0;
 	}
 
-	return (EOPNOTSUPP);
+	return (ENOTTY);
 }
diff --git a/sys/arch/amd64/amd64/mem.c b/sys/arch/amd64/amd64/mem.c
index c6c9ffd364b..55205417d6b 100644
--- a/sys/arch/amd64/amd64/mem.c
+++ b/sys/arch/amd64/amd64/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.35 2021/03/24 14:26:39 bluhm Exp $ */
+/*	$OpenBSD: mem.c,v 1.36 2024/06/23 22:08:37 kettenis Exp $ */
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -252,7 +252,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 		return mem_ioctl(dev, cmd, data, flags, p);
 	}
 #endif
-	return (ENODEV);
+	return (ENOTTY);
 }
 
 #ifdef MTRR
diff --git a/sys/arch/arm/arm/mem.c b/sys/arch/arm/arm/mem.c
index f0809db3634..85c0f69d5f1 100644
--- a/sys/arch/arm/arm/mem.c
+++ b/sys/arch/arm/arm/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.23 2021/03/25 04:12:00 jsg Exp $	*/
+/*	$OpenBSD: mem.c,v 1.24 2024/06/23 22:08:37 kettenis Exp $	*/
 /*	$NetBSD: mem.c,v 1.11 2003/10/16 12:02:58 jdolecek Exp $	*/
 
 /*
@@ -251,5 +251,5 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
                 return 0;
         }
 
-	return (EOPNOTSUPP);
+	return (ENOTTY);
 }
diff --git a/sys/arch/arm64/arm64/mem.c b/sys/arch/arm64/arm64/mem.c
index ace9d6699df..2084b979d04 100644
--- a/sys/arch/arm64/arm64/mem.c
+++ b/sys/arch/arm64/arm64/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.6 2018/05/04 15:45:11 visa Exp $	*/
+/*	$OpenBSD: mem.c,v 1.7 2024/06/23 22:08:37 kettenis Exp $	*/
 /*	$NetBSD: mem.c,v 1.11 2003/10/16 12:02:58 jdolecek Exp $	*/
 
 /*
@@ -253,5 +253,5 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
                 return 0;
         }
 
-	return (EOPNOTSUPP);
+	return (ENOTTY);
 }
diff --git a/sys/arch/hppa/hppa/mem.c b/sys/arch/hppa/hppa/mem.c
index 6752427dcf3..90dd7da574d 100644
--- a/sys/arch/hppa/hppa/mem.c
+++ b/sys/arch/hppa/hppa/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.6 2022/03/13 08:04:38 mpi Exp $	*/
+/*	$OpenBSD: mem.c,v 1.7 2024/06/23 22:08:37 kettenis Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -427,5 +427,5 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
                 return 0;
         }
 
-	return (EOPNOTSUPP);
+	return (ENOTTY);
 }
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c
index db316bd676a..6ae49d78e0d 100644
--- a/sys/arch/i386/i386/mem.c
+++ b/sys/arch/i386/i386/mem.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: mem.c,v 1.31 1996/05/03 19:42:19 christos Exp $	*/
-/*	$OpenBSD: mem.c,v 1.56 2023/03/08 04:43:07 guenther Exp $ */
+/*	$OpenBSD: mem.c,v 1.57 2024/06/23 22:08:37 kettenis Exp $ */
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -260,7 +260,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 		return mem_ioctl(dev, cmd, data, flags, p);
 	}
 #endif
-	return (ENODEV);
+	return (ENOTTY);
 }
 
 #ifdef MTRR
diff --git a/sys/arch/m88k/m88k/mem.c b/sys/arch/m88k/m88k/mem.c
index 5ccc2d50c85..217d2394c8b 100644
--- a/sys/arch/m88k/m88k/mem.c
+++ b/sys/arch/m88k/m88k/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.6 2017/12/14 03:30:43 guenther Exp $ */
+/*	$OpenBSD: mem.c,v 1.7 2024/06/23 22:08:37 kettenis Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -172,5 +172,5 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
                 return 0;
         }
 
-	return (EOPNOTSUPP);
+	return (ENOTTY);
 }
diff --git a/sys/arch/macppc/macppc/mem.c b/sys/arch/macppc/macppc/mem.c
index 945ee7435d6..1046e68e466 100644
--- a/sys/arch/macppc/macppc/mem.c
+++ b/sys/arch/macppc/macppc/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.28 2022/03/13 12:33:01 mpi Exp $	*/
+/*	$OpenBSD: mem.c,v 1.29 2024/06/23 22:08:37 kettenis Exp $	*/
 /*	$NetBSD: mem.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
 
 /*
@@ -314,5 +314,5 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
                 return 0;
         }
 
-	return (EOPNOTSUPP);
+	return (ENOTTY);
 }
diff --git a/sys/arch/mips64/mips64/mem.c b/sys/arch/mips64/mips64/mem.c
index ff0ff368c62..6a7f2d88e1d 100644
--- a/sys/arch/mips64/mips64/mem.c
+++ b/sys/arch/mips64/mips64/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.24 2019/12/20 13:34:41 visa Exp $	*/
+/*	$OpenBSD: mem.c,v 1.25 2024/06/23 22:08:37 kettenis Exp $	*/
 /*	$NetBSD: mem.c,v 1.6 1995/04/10 11:55:03 mycroft Exp $	*/
 
 /*
@@ -204,5 +204,5 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
                 return 0;
         }
 
-	return (EOPNOTSUPP);
+	return (ENOTTY);
 }
diff --git a/sys/arch/powerpc64/powerpc64/mem.c b/sys/arch/powerpc64/powerpc64/mem.c
index 93c48a950fb..dc691ab63cc 100644
--- a/sys/arch/powerpc64/powerpc64/mem.c
+++ b/sys/arch/powerpc64/powerpc64/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.1 2020/06/27 21:22:30 kettenis Exp $	*/
+/*	$OpenBSD: mem.c,v 1.2 2024/06/23 22:08:37 kettenis Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -197,5 +197,5 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
                 return 0;
         }
 
-	return (ENODEV);
+	return (ENOTTY);
 }
diff --git a/sys/arch/riscv64/riscv64/mem.c b/sys/arch/riscv64/riscv64/mem.c
index dffabeac580..8fededf437e 100644
--- a/sys/arch/riscv64/riscv64/mem.c
+++ b/sys/arch/riscv64/riscv64/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.5 2021/05/19 20:35:02 deraadt Exp $	*/
+/*	$OpenBSD: mem.c,v 1.6 2024/06/23 22:08:37 kettenis Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -249,5 +249,5 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 		return 0;
 	}
 
-	return (EOPNOTSUPP);
+	return (ENOTTY);
 }
diff --git a/sys/arch/sh/sh/mem.c b/sys/arch/sh/sh/mem.c
index 51c3b036441..d645b61cd8d 100644
--- a/sys/arch/sh/sh/mem.c
+++ b/sys/arch/sh/sh/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.11 2018/02/19 08:59:52 mpi Exp $	*/
+/*	$OpenBSD: mem.c,v 1.12 2024/06/23 22:08:37 kettenis Exp $	*/
 /*	$NetBSD: mem.c,v 1.21 2006/07/23 22:06:07 ad Exp $	*/
 
 /*
@@ -229,7 +229,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
                 return 0;
         }
 
-	return (EOPNOTSUPP);
+	return (ENOTTY);
 }
 
 /*
diff --git a/sys/arch/sparc64/sparc64/mem.c b/sys/arch/sparc64/sparc64/mem.c
index b0314bf27ad..acd60dd5fca 100644
--- a/sys/arch/sparc64/sparc64/mem.c
+++ b/sys/arch/sparc64/sparc64/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.20 2020/05/17 11:12:55 kn Exp $	*/
+/*	$OpenBSD: mem.c,v 1.21 2024/06/23 22:08:37 kettenis Exp $	*/
 /*	$NetBSD: mem.c,v 1.18 2001/04/24 04:31:12 thorpej Exp $ */
 
 /*
@@ -202,6 +202,5 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
                 return 0;
         }
 
-	return (EOPNOTSUPP);
+	return (ENOTTY);
 }
-
-- 
2.20.1