xnu-517.9.5.tar.gz

[apple/xnu.git] / bsd / dev / random / randomdev.c

diff --git a/bsd/dev/random/randomdev.c b/bsd/dev/random/randomdev.c
index 642add6685ea0e4295ca85ffdfe69722a08bddfe..dfb37cf5127342ad8fc4af3cc8c4379eb14fd3bb 100644 (file)
--- a/bsd/dev/random/randomdev.c
+++ b/bsd/dev/random/randomdev.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1999, 2000-2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999, 2000-2003 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -29,8 +29,6 @@
 #include <sys/fcntl.h>
 #include <miscfs/devfs/devfs.h>
 #include <kern/lock.h>
 #include <sys/fcntl.h>
 #include <miscfs/devfs/devfs.h>
 #include <kern/lock.h>

-#include <kern/task.h>
-#include <kern/thread.h>

 #include <sys/time.h>
 #include <sys/malloc.h>
 
 #include <sys/time.h>
 #include <sys/malloc.h>
 


@@ -39,6 +37,8 @@
 
 #define RANDOM_MAJOR  -1 /* let the kernel pick the device number */
 
 
 #define RANDOM_MAJOR  -1 /* let the kernel pick the device number */
 

+d_ioctl_t       random_ioctl;
+

 /*
  * A struct describing which functions will get invoked for certain
  * actions.
 /*
  * A struct describing which functions will get invoked for certain
  * actions.


@@ -49,7 +49,7 @@ static struct cdevsw random_cdevsw =
        random_close,           /* close */
        random_read,            /* read */
        random_write,           /* write */
        random_close,           /* close */
        random_read,            /* read */
        random_write,           /* write */

-       eno_ioctl,                      /* ioctl */
+       random_ioctl,                   /* ioctl */

        nulldev,                        /* stop */
        nulldev,                        /* reset */
        NULL,                           /* tty's */
        nulldev,                        /* stop */
        nulldev,                        /* reset */
        NULL,                           /* tty's */


@@ -141,14 +141,33 @@ random_init()
        }
 
        devfs_make_node(makedev (ret, 0), DEVFS_CHAR,
        }
 
        devfs_make_node(makedev (ret, 0), DEVFS_CHAR,

-               UID_ROOT, GID_WHEEL, 0644, "random", 0);
+               UID_ROOT, GID_WHEEL, 0666, "random", 0);

 
        /*
         * also make urandom 
         * (which is exactly the same thing in our context)
         */
        devfs_make_node(makedev (ret, 1), DEVFS_CHAR,
 
        /*
         * also make urandom 
         * (which is exactly the same thing in our context)
         */
        devfs_make_node(makedev (ret, 1), DEVFS_CHAR,

-               UID_ROOT, GID_WHEEL, 0644, "urandom", 0);
+               UID_ROOT, GID_WHEEL, 0666, "urandom", 0);
+}
+
+int
+random_ioctl(dev, cmd, data, flag, p)
+        dev_t dev;
+        u_long cmd;
+        caddr_t data;
+        int flag;
+        struct proc *p;
+{
+       switch (cmd) {
+       case FIONBIO:
+       case FIOASYNC:
+               break;
+       default:
+               return ENODEV;
+       }
+
+       return (0);

 }
 
 /*
 }
 
 /*


@@ -171,8 +190,10 @@ random_open(dev_t dev, int flags, int devtype, struct proc *p)
        if (flags & FWRITE) {
                if (securelevel >= 2)
                        return (EPERM);
        if (flags & FWRITE) {
                if (securelevel >= 2)
                        return (EPERM);

+#ifndef __APPLE__

                if ((securelevel >= 1) && suser(p->p_ucred, &p->p_acflag))
                        return (EPERM);
                if ((securelevel >= 1) && suser(p->p_ucred, &p->p_acflag))
                        return (EPERM);

+#endif /* !__APPLE__ */

        }
 
        return (0);
        }
 
        return (0);