d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fd: prepare do_dup for being exported

Browse Source 
- rename it to kern_dup.
- prefix flags with FD
- assert that correct flags were passed
This commit is contained in:
Mateusz Guzik 2015-07-09 15:19:45 +00:00
parent d19ba50e12
commit efdc25304c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=285321
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sys/kern/kern_descrip.c
View File

@ -102,7 +102,7 @@ static uma_zone_t filedesc0_zone;
static int closefp(struct filedesc *fdp, int fd, struct file *fp,
struct thread *td, int holdleaders);
static int do_dup(struct thread *td, int flags, int old, int new);
static int kern_dup(struct thread *td, int flags, int old, int new);
static int fd_first_free(struct filedesc *fdp, int low, int size);
static int fd_last_used(struct filedesc *fdp, int size);
static void fdgrowtable(struct filedesc *fdp, int nfd);
@ -111,10 +111,10 @@ static void fdunused(struct filedesc *fdp, int fd);
static void fdused(struct filedesc *fdp, int fd);
static int getmaxfd(struct thread *td);
/* Flags for do_dup() */
#define DUP_FIXED 0x1 /* Force fixed allocation. */
#define DUP_FCNTL 0x2 /* fcntl()-style errors. */
#define DUP_CLOEXEC 0x4 /* Atomically set FD_CLOEXEC. */
/* Flags for kern_dup() */
#define FDDUP_FIXED 0x1 /* Force fixed allocation. */
#define FDDUP_FCNTL 0x2 /* fcntl()-style errors. */
#define FDDUP_CLOEXEC 0x4 /* Atomically set FD_CLOEXEC. */
/*
* Each process has:
@ -361,7 +361,7 @@ int
sys_dup2(struct thread *td, struct dup2_args *uap)
{
return (do_dup(td, DUP_FIXED, (int)uap->from, (int)uap->to));
return (kern_dup(td, FDDUP_FIXED, (int)uap->from, (int)uap->to));
}
/*
@ -377,7 +377,7 @@ int
sys_dup(struct thread *td, struct dup_args *uap)
{
return (do_dup(td, 0, (int)uap->fd, 0));
return (kern_dup(td, 0, (int)uap->fd, 0));
}
/*
@ -487,22 +487,22 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg)
switch (cmd) {
case F_DUPFD:
tmp = arg;
error = do_dup(td, DUP_FCNTL, fd, tmp);
error = kern_dup(td, FDDUP_FCNTL, fd, tmp);
break;
case F_DUPFD_CLOEXEC:
tmp = arg;
error = do_dup(td, DUP_FCNTL | DUP_CLOEXEC, fd, tmp);
error = kern_dup(td, FDDUP_FCNTL | FDDUP_CLOEXEC, fd, tmp);
break;
case F_DUP2FD:
tmp = arg;
error = do_dup(td, DUP_FIXED, fd, tmp);
error = kern_dup(td, FDDUP_FIXED, fd, tmp);
break;
case F_DUP2FD_CLOEXEC:
tmp = arg;
error = do_dup(td, DUP_FIXED | DUP_CLOEXEC, fd, tmp);
error = kern_dup(td, FDDUP_FIXED | FDDUP_CLOEXEC, fd, tmp);
break;
case F_GETFD:
@ -795,7 +795,7 @@ getmaxfd(struct thread *td)
* Common code for dup, dup2, fcntl(F_DUPFD) and fcntl(F_DUP2FD).
*/
static int
do_dup(struct thread *td, int flags, int old, int new)
kern_dup(struct thread *td, int flags, int old, int new)
{
struct filedesc *fdp;
struct filedescent *oldfde, *newfde;
@ -807,6 +807,8 @@ do_dup(struct thread *td, int flags, int old, int new)
p = td->td_proc;
fdp = p->p_fd;
MPASS((flags & ~(FDDUP_FIXED | FDDUP_FCNTL | FDDUP_CLOEXEC)) == 0);
/*
* Verify we have a valid descriptor to dup from and possibly to
* dup to. Unlike dup() and dup2(), fcntl()'s F_DUPFD should
@ -815,10 +817,10 @@ do_dup(struct thread *td, int flags, int old, int new)
if (old < 0)
return (EBADF);
if (new < 0)
return (flags & DUP_FCNTL ? EINVAL : EBADF);
return (flags & FDDUP_FCNTL ? EINVAL : EBADF);
maxfd = getmaxfd(td);
if (new >= maxfd)
return (flags & DUP_FCNTL ? EINVAL : EBADF);
return (flags & FDDUP_FCNTL ? EINVAL : EBADF);
FILEDESC_XLOCK(fdp);
if (fget_locked(fdp, old) == NULL) {
@ -826,9 +828,9 @@ do_dup(struct thread *td, int flags, int old, int new)
return (EBADF);
}
oldfde = &fdp->fd_ofiles[old];
if (flags & DUP_FIXED && old == new) {
if (flags & FDDUP_FIXED && old == new) {
td->td_retval[0] = new;
if (flags & DUP_CLOEXEC)
if (flags & FDDUP_CLOEXEC)
fdp->fd_ofiles[new].fde_flags |= UF_EXCLOSE;
FILEDESC_XUNLOCK(fdp);
return (0);
@ -841,7 +843,7 @@ do_dup(struct thread *td, int flags, int old, int new)
* table is large enough to hold it, and grab it. Otherwise, just
* allocate a new descriptor the usual way.
*/
if (flags & DUP_FIXED) {
if (flags & FDDUP_FIXED) {
if (new >= fdp->fd_nfiles) {
/*
* The resource limits are here instead of e.g.
@ -892,7 +894,7 @@ do_dup(struct thread *td, int flags, int old, int new)
filecaps_free(&newfde->fde_caps);
memcpy(newfde, oldfde, fde_change_size);
filecaps_copy(&oldfde->fde_caps, &newfde->fde_caps);
if ((flags & DUP_CLOEXEC) != 0)
if ((flags & FDDUP_CLOEXEC) != 0)
newfde->fde_flags = oldfde->fde_flags | UF_EXCLOSE;
else
newfde->fde_flags = oldfde->fde_flags & ~UF_EXCLOSE;
@ -1988,7 +1990,7 @@ fdclearlocks(struct thread *td)
if (fdp->fd_holdleaderscount > 0 &&
(p->p_leader->p_flag & P_ADVLOCK) != 0) {
/*
* close() or do_dup() has cleared a reference
* close() or kern_dup() has cleared a reference
* in a shared file descriptor table.
*/
fdp->fd_holdleaderswakeup = 1;
@ -2215,7 +2217,7 @@ fdcheckstd(struct thread *td)
save = td->td_retval[0];
if (devnull != -1) {
error = do_dup(td, DUP_FIXED, devnull, i);
error = kern_dup(td, FDDUP_FIXED, devnull, i);
} else {
error = kern_openat(td, AT_FDCWD, "/dev/null",
UIO_SYSSPACE, O_RDWR, 0);