diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-05-28 13:55:45 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-06-17 20:47:38 +0200 |
| commit | c3695ab5f06af533deaf1de75cdd4631a9d77d00 (patch) | |
| tree | 89a2c59d982accae5760d86fc5ae4dfa6b55c087 /cryptodev_main.c | |
| parent | bda013fbafabd0d0826441cb40c93a46d4dc2301 (diff) | |
| download | cryptodev-linux-c3695ab5f06af533deaf1de75cdd4631a9d77d00.tar.gz cryptodev-linux-c3695ab5f06af533deaf1de75cdd4631a9d77d00.tar.xz cryptodev-linux-c3695ab5f06af533deaf1de75cdd4631a9d77d00.zip | |
Added some initial for of key. Added helper functions to enforce per user and per process limits.
Diffstat (limited to 'cryptodev_main.c')
| -rw-r--r-- | cryptodev_main.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/cryptodev_main.c b/cryptodev_main.c index 50e5a27..da7ef2b 100644 --- a/cryptodev_main.c +++ b/cryptodev_main.c @@ -562,13 +562,6 @@ cryptodev_ioctl(struct inode *inode, struct file *filp, struct fcrypt * fcr; uint32_t ses; int ret, fd; - unsigned int uid; - -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27) - uid = filp->f_uid; -#else - uid = filp->f_cred->fsuid; -#endif if (unlikely(!pcr)) BUG(); @@ -601,7 +594,7 @@ cryptodev_ioctl(struct inode *inode, struct file *filp, return copy_to_user((void*)arg, &cop, sizeof(cop)); default: - return ncr_ioctl(uid, pcr->ncr, cmd, arg); + return ncr_ioctl(pcr->ncr, filp, cmd, arg); } } |