vdp: fix dumb bug in the proposed VDPIOC_READ/WRITE ioctls

EtchedPixels · Sep 2, 2023 · a67f652 · a67f652
1 parent 73f7c29
commit a67f652
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/Kernel/platform-2063/devtty.c b/Kernel/platform-2063/devtty.c
@@ -438,7 +438,7 @@ int vdptty_ioctl(uint8_t minor, uarg_t arg, char *ptr)
 	{
 		struct vdp_rw rw;
 		uint16_t size;
-		uint8_t *addr = (uint8_t *)rw.data;
+		uint8_t *addr;
 		if (vswitch == 0) {
 			udata.u_error = EINVAL;
 			return -1;
@@ -447,6 +447,7 @@ int vdptty_ioctl(uint8_t minor, uarg_t arg, char *ptr)
 			udata.u_error = EFAULT;
 			return -1;
 		}
+		addr = (uint8_t *)rw.data;
 		size = rw.lines * rw.cols;
 		if (valaddr(addr, size, is_wr) != size) {
 			udata.u_error = EFAULT;

diff --git a/Kernel/platform-msx1/devtty.c b/Kernel/platform-msx1/devtty.c
@@ -433,7 +433,7 @@ int vdptty_ioctl(uint8_t minor, uarg_t arg, char *ptr)
 	{
 		struct vdp_rw rw;
 		uint16_t size;
-		uint8_t *addr = (uint8_t *)rw.data;
+		uint8_t *addr;
 		if (vswitch == 0) {
 			udata.u_error = EINVAL;
 			return -1;
@@ -443,6 +443,7 @@ int vdptty_ioctl(uint8_t minor, uarg_t arg, char *ptr)
 			return -1;
 		}
 		size = rw.lines * rw.cols;
+		addr = (uint8_t *)rw.data;
 		if (valaddr(addr, size, is_wr) != size) {
 			udata.u_error = EFAULT;
 			return -1;

diff --git a/Kernel/platform-mtx/devtty.c b/Kernel/platform-mtx/devtty.c
@@ -753,7 +753,7 @@ int mtx_vt_ioctl(uint_fast8_t minor, uarg_t request, char *data)
 	{
 		struct vdp_rw rw;
 		uint16_t size;
-		uint8_t *addr = (uint8_t *)rw.data;
+		uint8_t *addr;
 		if (vswitch == 0) {
 			udata.u_error = EINVAL;
 			return -1;
@@ -762,6 +762,7 @@ int mtx_vt_ioctl(uint_fast8_t minor, uarg_t request, char *data)
 			udata.u_error = EFAULT;
 			return -1;
 		}
+		addr = (uint8_t *)rw.data;
 		size = rw.lines * rw.cols;
 		if (valaddr(addr, size, is_wr) != size) {
 			udata.u_error = EFAULT;

diff --git a/Kernel/platform-n8/devtty.c b/Kernel/platform-n8/devtty.c
@@ -507,8 +507,8 @@ int n8tty_ioctl(uint8_t minor, uarg_t arg, char *ptr)
 	{
 		struct vdp_rw rw;
 		uint16_t size;
-		uint8_t *addr = (uint8_t *)rw.data;
-		
+		uint8_t *addr;
+
 		if (vswitch != minor) {
 			udata.u_error = EINVAL;
 			return -1;
@@ -517,6 +517,7 @@ int n8tty_ioctl(uint8_t minor, uarg_t arg, char *ptr)
 			udata.u_error = EFAULT;
 			return -1;
 		}
+		addr = (uint8_t *)rw.data;
 		size = rw.lines * rw.cols;
 		if (valaddr(addr, size, is_wr) != size) {
 			udata.u_error = EFAULT;

diff --git a/Kernel/platform-rc2014/video-tms9918a.c b/Kernel/platform-rc2014/video-tms9918a.c
@@ -361,7 +361,7 @@ int tms_ioctl(uint8_t minor, uarg_t arg, char *ptr)
 		{
 			struct vdp_rw rw;
 			uint16_t size;
-			uint8_t *addr = (uint8_t *) rw.data;
+			uint8_t *addr;
 			if (vswitch != minor) {
 				udata.u_error = EINVAL;
 				return -1;
@@ -370,6 +370,7 @@ int tms_ioctl(uint8_t minor, uarg_t arg, char *ptr)
 				udata.u_error = EFAULT;
 				return -1;
 			}
+			addr = (uint8_t *) rw.data;
 			size = rw.lines * rw.cols;
 			if (valaddr(addr, size, is_wr) != size) {
 				udata.u_error = EFAULT;