Page MenuHomeFreeBSD
Differential D17388 Diff 48680 sys/fs/devfs/devfs_vnops.c

Changeset View

Standalone View

View Options

sys/fs/devfs/devfs_vnops.c

Show First 20 Lines • Show All 73 Lines • ▼ Show 20 Lines
#include <fs/devfs/devfs_int.h> #include <fs/devfs/devfs_int.h>
#include <security/mac/mac_framework.h> #include <security/mac/mac_framework.h>
#include <vm/vm.h> #include <vm/vm.h>
#include <vm/vm_extern.h> #include <vm/vm_extern.h>
#include <vm/vm_object.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"); static MALLOC_DEFINE(M_CDEVPDATA, "DEVFSP", "Metainfo for cdev-fp data");
struct mtx devfs_de_interlock; struct mtx devfs_de_interlock;
MTX_SYSINIT(devfs_de_interlock, &devfs_de_interlock, "devfs interlock", MTX_DEF); MTX_SYSINIT(devfs_de_interlock, &devfs_de_interlock, "devfs interlock", MTX_DEF);
struct sx clone_drain_lock; struct sx clone_drain_lock;
SX_SYSINIT(clone_drain_lock, &clone_drain_lock, "clone events drain lock"); SX_SYSINIT(clone_drain_lock, &clone_drain_lock, "clone events drain lock");
struct mtx cdevpriv_mtx; struct mtx cdevpriv_mtx;
MTX_SYSINIT(cdevpriv_mtx, &cdevpriv_mtx, "cdevpriv lock", MTX_DEF); MTX_SYSINIT(cdevpriv_mtx, &cdevpriv_mtx, "cdevpriv lock", MTX_DEF);
▲ Show 20 Lines • Show All 672 Lines • ▼ Show 20 Linesdevfs_ioctl_f(struct file *fp, u_long com, void *data, struct ucred *cred, struct thread *td)
fpop = td->td_fpop; fpop = td->td_fpop;
td->td_fpop = fp; td->td_fpop = fp;
error = vnops.fo_ioctl(fp, com, data, cred, td); error = vnops.fo_ioctl(fp, com, data, cred, td);
td->td_fpop = fpop; td->td_fpop = fpop;
return (error); 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) {
kibUnsubmitted
Not Done
Inline Actions

Why do the calculation to extract the len when you can directly use FIODTYPEXXX value ?

kib: Why do the calculation to extract the len when you can directly use FIODTYPEXXX value ?
brooksAuthorUnsubmitted
Done
Inline Actions

Because this pattern is more general and costs basically nothing. I don't care much in this case, but I'd rather people find examples that are generalizable when looking to add compat support.

brooks: Because this pattern is more general and costs basically nothing. I don't care much in this…
kibUnsubmitted
Not Done
Inline Actions

I do not agree with 'more general' part, and it actually confused me when I read this patch initially. More, the type-punning you do is not common for our tree and typically the manual copying of the structure member is performed, as in the unpatched current sources. But ok.

kib: I do not agree with 'more general' part, and it actually confused me when I read this patch…
case FIODGNAME:
return (fgnup->fgn.buf);
kibUnsubmitted
Not Done
Inline Actions

() around sizeof() are not needed.

kib: () around sizeof() are not needed.
#ifdef COMPAT_FREEBSD32
case FIODGNAME_32:
return ((void *)(uintptr_t)fgnup->fgn32.buf);
#endif
default:
panic("Unhandled ioctl command %ld", com);
}
}
static int static int
devfs_ioctl(struct vop_ioctl_args *ap) devfs_ioctl(struct vop_ioctl_args *ap)
{ {
struct fiodgname_arg *fgn; struct fiodgname_arg *fgn;
struct vnode *vpold, *vp; struct vnode *vpold, *vp;
struct cdevsw *dsw; struct cdevsw *dsw;
struct thread *td; struct thread *td;
struct cdev *dev; struct cdev *dev;
int error, ref, i; int error, ref, i;
const char *p; const char *p;
u_long com; u_long com;
vp = ap->a_vp; vp = ap->a_vp;
com = ap->a_command; com = ap->a_command;
td = ap->a_td; td = ap->a_td;
dsw = devvn_refthread(vp, &dev, &ref); dsw = devvn_refthread(vp, &dev, &ref);
if (dsw == NULL) if (dsw == NULL)
return (ENXIO); return (ENXIO);
KASSERT(dev->si_refcount > 0, KASSERT(dev->si_refcount > 0,
("devfs: un-referenced struct cdev *(%s)", devtoname(dev))); ("devfs: un-referenced struct cdev *(%s)", devtoname(dev)));
if (com == FIODTYPE) { switch (com) {
case FIODTYPE:
*(int *)ap->a_data = dsw->d_flags & D_TYPEMASK; *(int *)ap->a_data = dsw->d_flags & D_TYPEMASK;
error = 0; error = 0;
goto out; break;
} else if (com == FIODGNAME) { case FIODGNAME:
#ifdef COMPAT_FREEBSD32
case FIODGNAME_32:
#endif
fgn = ap->a_data; fgn = ap->a_data;
p = devtoname(dev); p = devtoname(dev);
i = strlen(p) + 1; i = strlen(p) + 1;
if (i > fgn->len) if (i > fgn->len)
error = EINVAL; error = EINVAL;
else else
error = copyout(p, fgn->buf, i); error = copyout(p, fiodgname_buf_get_ptr(fgn, com), i);
goto out; break;
default:
error = dsw->d_ioctl(dev, com, ap->a_data, ap->a_fflag, td);
} }
error = dsw->d_ioctl(dev, com, ap->a_data, ap->a_fflag, td);
out:
dev_relthread(dev, ref); dev_relthread(dev, ref);
if (error == ENOIOCTL) if (error == ENOIOCTL)
error = ENOTTY; error = ENOTTY;
if (error == 0 && com == TIOCSCTTY) { if (error == 0 && com == TIOCSCTTY) {
/* Do nothing if reassigning same control tty */ /* Do nothing if reassigning same control tty */
sx_slock(&proctree_lock); sx_slock(&proctree_lock);
if (td->td_proc->p_session->s_ttyvp == vp) { if (td->td_proc->p_session->s_ttyvp == vp) {
▲ Show 20 Lines • Show All 1,149 Lines • Show Last 20 Lines