Author: brooks
Date: Thu Oct 4 23:55:03 2018
New Revision: 339186
URL: https://svnweb.freebsd.org/changeset/base/339186
Log:
Revert r339174: Move 32-bit compat support for FIODGNAME to the right place.
A case was missed in this commit which breaks sshing into a 32-bit sshd
on a 64-bit system.
Approved by: re (gjb)
Modified:
head/sys/compat/freebsd32/freebsd32_ioctl.c
head/sys/compat/freebsd32/freebsd32_ioctl.h
head/sys/fs/devfs/devfs_vnops.c
Modified: head/sys/compat/freebsd32/freebsd32_ioctl.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_ioctl.c Thu Oct 4 22:03:58 2018
(r339185)
+++ head/sys/compat/freebsd32/freebsd32_ioctl.c Thu Oct 4 23:55:03 2018
(r339186)
@@ -59,6 +59,22 @@ __FBSDID("$FreeBSD$");
CTASSERT(sizeof(struct mem_range_op32) == 12);
static int
+freebsd32_ioctl_fiodgname(struct thread *td,
+ struct freebsd32_ioctl_args *uap, struct file *fp)
+{
+ struct fiodgname_arg fgn;
+ struct fiodgname_arg32 fgn32;
+ int error;
+
+ if ((error = copyin(uap->data, &fgn32, sizeof fgn32)) != 0)
+ return (error);
+ CP(fgn32, fgn, len);
+ PTRIN_CP(fgn32, fgn, buf);
+ error = fo_ioctl(fp, FIODGNAME, (caddr_t)&fgn, td->td_ucred, td);
+ return (error);
+}
+
+static int
freebsd32_ioctl_memrange(struct thread *td,
struct freebsd32_ioctl_args *uap, struct file *fp)
{
@@ -221,6 +237,10 @@ freebsd32_ioctl(struct thread *td, struct freebsd32_io
}
switch (uap->com) {
+ case FIODGNAME_32:
+ error = freebsd32_ioctl_fiodgname(td, uap, fp);
+ break;
+
case MEMRANGE_GET32: /* FALLTHROUGH */
case MEMRANGE_SET32:
error = freebsd32_ioctl_memrange(td, uap, fp);
Modified: head/sys/compat/freebsd32/freebsd32_ioctl.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_ioctl.h Thu Oct 4 22:03:58 2018
(r339185)
+++ head/sys/compat/freebsd32/freebsd32_ioctl.h Thu Oct 4 23:55:03 2018
(r339186)
@@ -38,6 +38,11 @@
typedef __uint32_t caddr_t32;
+struct fiodgname_arg32 {
+ int len;
+ caddr_t32 buf;
+};
+
struct mem_range_op32
{
caddr_t32 mo_desc;
@@ -55,6 +60,7 @@ struct pci_bar_mmap32 {
int pbm_memattr;
};
+#define FIODGNAME_32 _IOW('f', 120, struct fiodgname_arg32)
#define MEMRANGE_GET32 _IOWR('m', 50, struct mem_range_op32)
#define MEMRANGE_SET32 _IOW('m', 51, struct mem_range_op32)
#define SG_IO_32 _IOWR(SGIOC, 0x85, struct sg_io_hdr32)
Modified: head/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- head/sys/fs/devfs/devfs_vnops.c Thu Oct 4 22:03:58 2018
(r339185)
+++ head/sys/fs/devfs/devfs_vnops.c Thu Oct 4 23:55:03 2018
(r339186)
@@ -79,14 +79,6 @@ static struct fileops devfs_ops_f;
#include <vm/vm_extern.h>
#include <vm/vm_object.h>
-#ifdef COMPAT_FREEBSD32
-struct fiodgname_arg32 {
- int len;
- uint32_t buf; /* (void *) */
-};
-#define FIODGNAME_32 _IOC_NEWTYPE(FIODGNAME, struct fiodgname_arg32)
-#endif
-
static MALLOC_DEFINE(M_CDEVPDATA, "DEVFSP", "Metainfo for cdev-fp data");
struct mtx devfs_de_interlock;
@@ -775,29 +767,6 @@ devfs_ioctl_f(struct file *fp, u_long com, void *data,
return (error);
}
-static void *
-fiodgname_buf_get_ptr(void *fgnp, u_long com)
-{
- union {
- struct fiodgname_arg fgn;
-#ifdef COMPAT_FREEBSD32
- struct fiodgname_arg32 fgn32;
-#endif
- } *fgnup;
-
- fgnup = fgnp;
- switch (com) {
- case FIODGNAME:
- return (fgnup->fgn.buf);
-#ifdef COMPAT_FREEBSD32
- case FIODGNAME_32:
- return ((void *)(uintptr_t)fgnup->fgn32.buf);
-#endif
- default:
- panic("Unhandled ioctl command %ld", com);
- }
-}
-
static int
devfs_ioctl(struct vop_ioctl_args *ap)
{
@@ -820,27 +789,24 @@ devfs_ioctl(struct vop_ioctl_args *ap)
KASSERT(dev->si_refcount > 0,
("devfs: un-referenced struct cdev *(%s)", devtoname(dev)));
- switch (com) {
- case FIODTYPE:
+ if (com == FIODTYPE) {
*(int *)ap->a_data = dsw->d_flags & D_TYPEMASK;
error = 0;
- break;
- case FIODGNAME:
-#ifdef COMPAT_FREEBSD32
- case FIODGNAME_32:
-#endif
+ goto out;
+ } else if (com == FIODGNAME) {
fgn = ap->a_data;
p = devtoname(dev);
i = strlen(p) + 1;
if (i > fgn->len)
error = EINVAL;
else
- error = copyout(p, fiodgname_buf_get_ptr(fgn, com), i);
- break;
- default:
- error = dsw->d_ioctl(dev, com, ap->a_data, ap->a_fflag, td);
+ error = copyout(p, fgn->buf, i);
+ goto out;
}
+ error = dsw->d_ioctl(dev, com, ap->a_data, ap->a_fflag, td);
+
+out:
dev_relthread(dev, ref);
if (error == ENOIOCTL)
error = ENOTTY;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
