rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-05-14 06:59:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix reference counting for file descriptors

Browse Source 
Update #3132.
This commit is contained in:
Sebastian Huber 2017-11-10 11:01:39 +01:00
parent b15a71914d
commit 72d5fa11a8
5 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freebsd/sys/kern/kern_event.c
View File

@ -939,7 +939,9 @@ kern_kqueue(struct thread *td, int flags, struct filecaps *fcaps)
#endif /* __rtems__ */ #endif /* __rtems__ */
finit(fp, FREAD | FWRITE, DTYPE_KQUEUE, kq, &kqueueops); finit(fp, FREAD | FWRITE, DTYPE_KQUEUE, kq, &kqueueops);
#ifndef __rtems__
fdrop(fp, td); fdrop(fp, td);
#endif /* __rtems__ */
td->td_retval[0] = fd; td->td_retval[0] = fd;
return (0); return (0);

6
freebsd/sys/kern/sys_pipe.c
View File

@ -485,16 +485,22 @@ kern_pipe(struct thread *td, int fildes[2], int flags, struct filecaps *fcaps1,
error = falloc_caps(td, &wf, &fd, flags, fcaps2); error = falloc_caps(td, &wf, &fd, flags, fcaps2);
if (error) { if (error) {
fdclose(td, rf, fildes[0]); fdclose(td, rf, fildes[0]);
#ifndef __rtems__
fdrop(rf, td); fdrop(rf, td);
#endif /* __rtems__ */
/* rpipe has been closed by fdrop(). */ /* rpipe has been closed by fdrop(). */
pipeclose(wpipe); pipeclose(wpipe);
return (error); return (error);
} }
/* An extra reference on `wf' has been held for us by falloc_caps(). */ /* An extra reference on `wf' has been held for us by falloc_caps(). */
finit(wf, fflags, DTYPE_PIPE, wpipe, &pipeops); finit(wf, fflags, DTYPE_PIPE, wpipe, &pipeops);
#ifndef __rtems__
fdrop(wf, td); fdrop(wf, td);
#endif /* __rtems__ */
fildes[1] = fd; fildes[1] = fd;
#ifndef __rtems__
fdrop(rf, td); fdrop(rf, td);
#endif /* __rtems__ */
return (0); return (0);
} }

10
freebsd/sys/kern/uipc_syscalls.c
View File

@ -214,7 +214,9 @@ kern_socket(struct thread *td, int domain, int type, int protocol)
(void) fo_ioctl(fp, FIONBIO, &fflag, td->td_ucred, td); (void) fo_ioctl(fp, FIONBIO, &fflag, td->td_ucred, td);
td->td_retval[0] = fd; td->td_retval[0] = fd;
} }
#ifndef __rtems__
fdrop(fp, td); fdrop(fp, td);
#endif /* __rtems__ */
return (error); return (error);
} }
#ifdef __rtems__ #ifdef __rtems__
@ -616,8 +618,10 @@ done:
} else } else
*fp = NULL; *fp = NULL;
} }
#ifndef __rtems__
if (nfp != NULL) if (nfp != NULL)
fdrop(nfp, td); fdrop(nfp, td);
#endif /* __rtems__ */
fdrop(headfp, td); fdrop(headfp, td);
return (error); return (error);
} }
@ -840,15 +844,21 @@ kern_socketpair(struct thread *td, int domain, int type, int protocol,
(void) fo_ioctl(fp1, FIONBIO, &fflag, td->td_ucred, td); (void) fo_ioctl(fp1, FIONBIO, &fflag, td->td_ucred, td);
(void) fo_ioctl(fp2, FIONBIO, &fflag, td->td_ucred, td); (void) fo_ioctl(fp2, FIONBIO, &fflag, td->td_ucred, td);
} }
#ifndef __rtems__
fdrop(fp1, td); fdrop(fp1, td);
fdrop(fp2, td); fdrop(fp2, td);
#endif /* __rtems__ */
return (0); return (0);
free4: free4:
fdclose(td, fp2, rsv[1]); fdclose(td, fp2, rsv[1]);
#ifndef __rtems__
fdrop(fp2, td); fdrop(fp2, td);
#endif /* __rtems__ */
free3: free3:
fdclose(td, fp1, rsv[0]); fdclose(td, fp1, rsv[0]);
#ifndef __rtems__
fdrop(fp1, td); fdrop(fp1, td);
#endif /* __rtems__ */
free2: free2:
if (so2 != NULL) if (so2 != NULL)
(void)soclose(so2); (void)soclose(so2);

7
freebsd/sys/sys/file.h
View File

@ -413,6 +413,13 @@ rtems_bsd_fdrop(struct file *fp)
rtems_libio_iop_drop(&fp->f_io); rtems_libio_iop_drop(&fp->f_io);
} }
/*
* WARNING: fdalloc() and falloc_caps() do not increment the reference count of
* the file descriptor in contrast to FreeBSD. We must not call the fdrop()
* corresponding to a fdalloc() or falloc_caps(). The reason for this is that
* FreeBSD performs a lazy cleanup once the reference count reaches zero.
* RTEMS uses the reference count to determine if a cleanup is allowed.
*/
#define fdrop(fp, td) rtems_bsd_fdrop(fp) #define fdrop(fp, td) rtems_bsd_fdrop(fp)
#endif /* __rtems__ */ #endif /* __rtems__ */

5
freebsd/sys/sys/filedesc.h
View File

@ -202,7 +202,6 @@ falloc_caps(struct thread *td, struct file **resultfp, int *resultfd,
*resultfp = rtems_bsd_iop_to_fp(iop); *resultfp = rtems_bsd_iop_to_fp(iop);
if (iop != NULL) { if (iop != NULL) {
rtems_libio_iop_hold(iop);
iop->pathinfo.mt_entry = &rtems_filesystem_null_mt_entry; iop->pathinfo.mt_entry = &rtems_filesystem_null_mt_entry;
rtems_filesystem_location_add_to_mt_entry(&iop->pathinfo); rtems_filesystem_location_add_to_mt_entry(&iop->pathinfo);
*resultfd = rtems_libio_iop_to_descriptor(iop); *resultfd = rtems_libio_iop_to_descriptor(iop);
@ -223,6 +222,10 @@ int fdcheckstd(struct thread *td);
#ifndef __rtems__ #ifndef __rtems__
void fdclose(struct thread *td, struct file *fp, int idx); void fdclose(struct thread *td, struct file *fp, int idx);
#else /* __rtems__ */ #else /* __rtems__ */
/*
* WARNING: Use of fdrop() after fclose() corrupts the file descriptor. See
* fdrop() comment.
*/
static inline void static inline void
fdclose(struct thread *td, struct file *fp, int idx) fdclose(struct thread *td, struct file *fp, int idx)
{ {