xnu-344.21.73.tar.gz

[apple/xnu.git] / bsd / sys / file.h

diff --git a/bsd/sys/file.h b/bsd/sys/file.h
index 7d6ace7634de43ab8cf3fb3bab84c62ccc7fd420..8a29f42f6140eb7caaaef1f50ee1404b7f4dac07 100644 (file)
--- a/bsd/sys/file.h
+++ b/bsd/sys/file.h
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -63,6 +66,7 @@
 #include <sys/unistd.h>
 
 #ifdef KERNEL
+#include <sys/errno.h>
 #include <sys/queue.h>
 #include <sys/cdefs.h>
 
@@ -100,7 +104,7 @@ struct file {
                int     (*fo_close)     __P((struct file *fp, struct proc *p));
        } *f_ops;
        off_t   f_offset;
-       caddr_t f_data;         /* vnode or socket */
+       caddr_t f_data;         /* vnode or socket or SHM or semaphore */
 };
 
 #ifdef __APPLE_API_PRIVATE
@@ -130,7 +134,8 @@ fo_read(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct
 {
        int error;
 
-       fref(fp);
+       if ((error = fref(fp)) == -1)
+               return (EBADF);
        error = (*fp->f_ops->fo_read)(fp, uio, cred, flags, p);
        frele(fp);
        return (error);
@@ -141,7 +146,8 @@ fo_write(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct
 {
        int error;
 
-       fref(fp);
+       if ((error = fref(fp)) == -1)
+               return (EBADF);
        error = (*fp->f_ops->fo_write)(fp, uio, cred, flags, p);
        frele(fp);
        return (error);
@@ -152,7 +158,8 @@ fo_ioctl(struct file *fp, u_long com, caddr_t data, struct proc *p)
 {
        int error;   
 
-       fref(fp);
+       if ((error = fref(fp)) == -1)
+               return (EBADF);
        error = (*fp->f_ops->fo_ioctl)(fp, com, data, p);
        frele(fp);
        return (error);