patch-2_6_7-vs1_9_1_12
[linux-2.6.git] / arch / s390 / kernel / compat_linux.c
index df06185..5685c5f 100644 (file)
@@ -355,144 +355,6 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned
                return sys_ftruncate(fd, (high << 32) | low);
 }
 
-typedef ssize_t (*io_fn_t)(struct file *, char *, size_t, loff_t *);
-typedef ssize_t (*iov_fn_t)(struct file *, const struct iovec *, unsigned long, loff_t *);
-
-static long do_readv_writev32(int type, struct file *file,
-                             const struct compat_iovec *vector, u32 count)
-{
-       unsigned long tot_len;
-       struct iovec iovstack[UIO_FASTIOV];
-       struct iovec *iov=iovstack, *ivp;
-       struct inode *inode;
-       long retval, i;
-       io_fn_t fn;
-       iov_fn_t fnv;
-
-       /* First get the "struct iovec" from user memory and
-        * verify all the pointers
-        */
-       if (!count)
-               return 0;
-       if (verify_area(VERIFY_READ, vector, sizeof(struct compat_iovec)*count))
-               return -EFAULT;
-       if (count > UIO_MAXIOV)
-               return -EINVAL;
-       if (count > UIO_FASTIOV) {
-               iov = kmalloc(count*sizeof(struct iovec), GFP_KERNEL);
-               if (!iov)
-                       return -ENOMEM;
-       }
-
-       tot_len = 0;
-       i = count;
-       ivp = iov;
-       retval = -EINVAL;
-       while(i > 0) {
-               compat_ssize_t tmp = tot_len;
-               compat_ssize_t len;
-               u32 buf;
-
-               if (__get_user(len, &vector->iov_len) ||
-                   __get_user(buf, &vector->iov_base)) {
-                       retval = -EFAULT;
-                       goto out;
-               }
-               if (len < 0)    /* size_t not fitting an ssize_t32 .. */
-                       goto out;
-               tot_len += len;
-               if (tot_len < tmp) /* maths overflow on the compat_ssize_t */
-                       goto out;
-               ivp->iov_base = (void *)A(buf);
-               ivp->iov_len = (__kernel_size_t) len;
-               vector++;
-               ivp++;
-               i--;
-       }
-       if (tot_len == 0) {
-               retval = 0;
-               goto out;
-       }
-
-       inode = file->f_dentry->d_inode;
-       /* VERIFY_WRITE actually means a read, as we write to user space */
-       retval = locks_verify_area((type == VERIFY_WRITE
-                                   ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE),
-                                  inode, file, file->f_pos, tot_len);
-       if (retval)
-               goto out;
-
-       /* VERIFY_WRITE actually means a read, as we write to user space */
-       fnv = (type == VERIFY_WRITE ? file->f_op->readv : file->f_op->writev);
-       if (fnv) {
-               retval = fnv(file, iov, count, &file->f_pos);
-               goto out;
-       }
-
-       fn = (type == VERIFY_WRITE ? file->f_op->read :
-             (io_fn_t) file->f_op->write);
-
-       ivp = iov;
-       while (count > 0) {
-               void * base;
-               int len, nr;
-
-               base = ivp->iov_base;
-               len = ivp->iov_len;
-               ivp++;
-               count--;
-               nr = fn(file, base, len, &file->f_pos);
-               if (nr < 0) {
-                       if (!retval)
-                               retval = nr;
-                       break;
-               }
-               retval += nr;
-               if (nr != len)
-                       break;
-       }
-out:
-       if (iov != iovstack)
-               kfree(iov);
-
-       return retval;
-}
-
-asmlinkage long sys32_readv(int fd, struct compat_iovec *vector, unsigned long count)
-{
-       struct file *file;
-       long ret = -EBADF;
-
-       file = fget(fd);
-       if(!file)
-               goto bad_file;
-
-       if (file->f_op && (file->f_mode & FMODE_READ) &&
-           (file->f_op->readv || file->f_op->read))
-               ret = do_readv_writev32(VERIFY_WRITE, file, vector, count);
-       fput(file);
-
-bad_file:
-       return ret;
-}
-
-asmlinkage long sys32_writev(int fd, struct compat_iovec *vector, unsigned long count)
-{
-       struct file *file;
-       int ret = -EBADF;
-
-       file = fget(fd);
-       if(!file)
-               goto bad_file;
-       if (file->f_op && (file->f_mode & FMODE_WRITE) &&
-           (file->f_op->writev || file->f_op->write))
-               ret = do_readv_writev32(VERIFY_READ, file, vector, count);
-       fput(file);
-
-bad_file:
-       return ret;
-}
-
 /* readdir & getdents */
 
 #define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
@@ -623,160 +485,6 @@ out:
 
 /* end of readdir & getdents */
 
-/*
- * Ooo, nasty.  We need here to frob 32-bit unsigned longs to
- * 64-bit unsigned longs.
- */
-
-static inline int
-get_fd_set32(unsigned long n, unsigned long *fdset, u32 *ufdset)
-{
-       if (ufdset) {
-               unsigned long odd;
-
-               if (verify_area(VERIFY_WRITE, ufdset, n*sizeof(u32)))
-                       return -EFAULT;
-
-               odd = n & 1UL;
-               n &= ~1UL;
-               while (n) {
-                       unsigned long h, l;
-                       __get_user(l, ufdset);
-                       __get_user(h, ufdset+1);
-                       ufdset += 2;
-                       *fdset++ = h << 32 | l;
-                       n -= 2;
-               }
-               if (odd)
-                       __get_user(*fdset, ufdset);
-       } else {
-               /* Tricky, must clear full unsigned long in the
-                * kernel fdset at the end, this makes sure that
-                * actually happens.
-                */
-               memset(fdset, 0, ((n + 1) & ~1)*sizeof(u32));
-       }
-       return 0;
-}
-
-static inline void
-set_fd_set32(unsigned long n, u32 *ufdset, unsigned long *fdset)
-{
-       unsigned long odd;
-
-       if (!ufdset)
-               return;
-
-       odd = n & 1UL;
-       n &= ~1UL;
-       while (n) {
-               unsigned long h, l;
-               l = *fdset++;
-               h = l >> 32;
-               __put_user(l, ufdset);
-               __put_user(h, ufdset+1);
-               ufdset += 2;
-               n -= 2;
-       }
-       if (odd)
-               __put_user(*fdset, ufdset);
-}
-
-#define MAX_SELECT_SECONDS \
-       ((unsigned long) (MAX_SCHEDULE_TIMEOUT / HZ)-1)
-
-asmlinkage long sys32_select(int n, u32 *inp, u32 *outp, u32 *exp,
-                               struct compat_timeval *tvp)
-{
-       fd_set_bits fds;
-       char *bits;
-       unsigned long nn;
-       long timeout;
-       int ret, size;
-
-       timeout = MAX_SCHEDULE_TIMEOUT;
-       if (tvp) {
-               int sec, usec;
-
-               if ((ret = verify_area(VERIFY_READ, tvp, sizeof(*tvp)))
-                   || (ret = __get_user(sec, &tvp->tv_sec))
-                   || (ret = __get_user(usec, &tvp->tv_usec)))
-                       goto out_nofds;
-
-               ret = -EINVAL;
-               if(sec < 0 || usec < 0)
-                       goto out_nofds;
-
-               if ((unsigned long) sec < MAX_SELECT_SECONDS) {
-                       timeout = (usec + 1000000/HZ - 1) / (1000000/HZ);
-                       timeout += sec * (unsigned long) HZ;
-               }
-       }
-
-       ret = -EINVAL;
-       if (n < 0)
-               goto out_nofds;
-       if (n > current->files->max_fdset)
-               n = current->files->max_fdset;
-
-       /*
-        * We need 6 bitmaps (in/out/ex for both incoming and outgoing),
-        * since we used fdset we need to allocate memory in units of
-        * long-words. 
-        */
-       ret = -ENOMEM;
-       size = FDS_BYTES(n);
-       bits = kmalloc(6 * size, GFP_KERNEL);
-       if (!bits)
-               goto out_nofds;
-       fds.in      = (unsigned long *)  bits;
-       fds.out     = (unsigned long *) (bits +   size);
-       fds.ex      = (unsigned long *) (bits + 2*size);
-       fds.res_in  = (unsigned long *) (bits + 3*size);
-       fds.res_out = (unsigned long *) (bits + 4*size);
-       fds.res_ex  = (unsigned long *) (bits + 5*size);
-
-       nn = (n + 8*sizeof(u32) - 1) / (8*sizeof(u32));
-       if ((ret = get_fd_set32(nn, fds.in, inp)) ||
-           (ret = get_fd_set32(nn, fds.out, outp)) ||
-           (ret = get_fd_set32(nn, fds.ex, exp)))
-               goto out;
-       zero_fd_set(n, fds.res_in);
-       zero_fd_set(n, fds.res_out);
-       zero_fd_set(n, fds.res_ex);
-
-       ret = do_select(n, &fds, &timeout);
-
-       if (tvp && !(current->personality & STICKY_TIMEOUTS)) {
-               int sec = 0, usec = 0;
-               if (timeout) {
-                       sec = timeout / HZ;
-                       usec = timeout % HZ;
-                       usec *= (1000000/HZ);
-               }
-               put_user(sec, &tvp->tv_sec);
-               put_user(usec, &tvp->tv_usec);
-       }
-
-       if (ret < 0)
-               goto out;
-       if (!ret) {
-               ret = -ERESTARTNOHAND;
-               if (signal_pending(current))
-                       goto out;
-               ret = 0;
-       }
-
-       set_fd_set32(nn, inp, fds.res_in);
-       set_fd_set32(nn, outp, fds.res_out);
-       set_fd_set32(nn, exp, fds.res_ex);
-
-out:
-       kfree(bits);
-out_nofds:
-       return ret;
-}
-
 int cp_compat_stat(struct kstat *stat, struct compat_stat *statbuf)
 {
        int err;
@@ -1026,188 +734,6 @@ sys32_rt_sigqueueinfo(int pid, int sig, siginfo_t32 __user *uinfo)
        return ret;
 }
 
-extern void check_pending(int signum);
-
-/*
- * count32() counts the number of arguments/envelopes
- */
-static int count32(u32 * argv)
-{
-       int i = 0;
-
-       if (argv != NULL) {
-               for (;;) {
-                       u32 p; int error;
-
-                       error = get_user(p,argv);
-                       if (error) return error;
-                       if (!p) break;
-                       argv++; i++;
-               }
-       }
-       return i;
-}
-
-/*
- * 'copy_string32()' copies argument/envelope strings from user
- * memory to free pages in kernel mem. These are in a format ready
- * to be put directly into the top of new user memory.
- */
-static int copy_strings32(int argc, u32 * argv, struct linux_binprm *bprm)
-{
-       while (argc-- > 0) {
-               u32 str;
-               int len;
-               unsigned long pos;
-
-               if (get_user(str, argv + argc) ||
-                   !str ||
-                   !(len = strnlen_user((char *)A(str), bprm->p)))
-                       return -EFAULT;
-
-               if (bprm->p < len)
-                       return -E2BIG;
-
-               bprm->p -= len;
-
-               pos = bprm->p;
-               while (len) {
-                       char *kaddr;
-                       struct page *page;
-                       int offset, bytes_to_copy, new, err;
-
-                       offset = pos % PAGE_SIZE;
-                       page = bprm->page[pos / PAGE_SIZE];
-                       new = 0;
-                       if (!page) {
-                               page = alloc_page(GFP_USER);
-                               bprm->page[pos / PAGE_SIZE] = page;
-                               if (!page)
-                                       return -ENOMEM;
-                               new = 1;
-                       }
-                       kaddr = (char *)kmap(page);
-
-                       if (new && offset)
-                               memset(kaddr, 0, offset);
-                       bytes_to_copy = PAGE_SIZE - offset;
-                       if (bytes_to_copy > len) {
-                               bytes_to_copy = len;
-                               if (new)
-                                       memset(kaddr+offset+len, 0,
-                                              PAGE_SIZE-offset-len);
-                       }
-
-                       err = copy_from_user(kaddr + offset, (char *)A(str),
-                                            bytes_to_copy);
-                       kunmap(page);
-
-                       if (err)
-                               return -EFAULT;
-
-                       pos += bytes_to_copy;
-                       str += bytes_to_copy;
-                       len -= bytes_to_copy;
-               }
-       }
-       return 0;
-}
-
-/*
- * sys32_execve() executes a new program.
- */
-static inline int 
-do_execve32(char * filename, u32 * argv, u32 * envp, struct pt_regs * regs)
-{
-       struct linux_binprm bprm;
-       struct file * file;
-       int retval;
-       int i;
-
-       sched_balance_exec();
-
-       file = open_exec(filename);
-
-       retval = PTR_ERR(file);
-       if (IS_ERR(file))
-               return retval;
-
-       bprm.p = PAGE_SIZE*MAX_ARG_PAGES-sizeof(void *);
-       memset(bprm.page, 0, MAX_ARG_PAGES * sizeof(bprm.page[0]));
-
-       bprm.file = file;
-       bprm.filename = filename;
-       bprm.interp = filename;
-       bprm.sh_bang = 0;
-       bprm.loader = 0;
-       bprm.exec = 0;
-       bprm.mm = mm_alloc();
-       retval = -ENOMEM;
-       if (!bprm.mm)
-               goto out_file;
-
-       /* init_new_context is empty for s390x. */
-
-       bprm.argc = count32(argv);
-       if ((retval = bprm.argc) < 0)
-               goto out_mm;
-
-       bprm.envc = count32(envp);
-       if ((retval = bprm.envc) < 0)
-               goto out_mm;
-
-       retval = security_bprm_alloc(&bprm);
-       if (retval)
-               goto out;
-
-       retval = prepare_binprm(&bprm);
-       if (retval < 0)
-               goto out;
-       
-       retval = copy_strings_kernel(1, &bprm.filename, &bprm);
-       if (retval < 0)
-               goto out;
-
-       bprm.exec = bprm.p;
-       retval = copy_strings32(bprm.envc, envp, &bprm);
-       if (retval < 0)
-               goto out;
-
-       retval = copy_strings32(bprm.argc, argv, &bprm);
-       if (retval < 0)
-               goto out;
-
-       retval = search_binary_handler(&bprm, regs);
-       if (retval >= 0) {
-               /* execve success */
-               security_bprm_free(&bprm);
-               return retval;
-       }
-
-out:
-       /* Something went wrong, return the inode and free the argument pages*/
-       for (i=0 ; i<MAX_ARG_PAGES ; i++) {
-               struct page * page = bprm.page[i];
-               if (page)
-                       __free_page(page);
-       }
-
-       if (bprm.security)
-               security_bprm_free(&bprm);
-
-out_mm:
-       if (bprm.mm)
-               mmdrop(bprm.mm);
-
-out_file:
-       if (bprm.file) {
-               allow_write_access(bprm.file);
-               fput(bprm.file);
-       }
-
-       return retval;
-}
-
 /*
  * sys32_execve() executes a new program after the asm stub has set
  * things up for us.  This should basically do what I want it to.
@@ -1218,11 +744,12 @@ sys32_execve(struct pt_regs regs)
         int error;
         char * filename;
 
-        filename = getname((char *)A(regs.orig_gpr2));
+        filename = getname(compat_ptr(regs.orig_gpr2));
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = do_execve32(filename, (u32 *)A(regs.gprs[3]), (u32 *)A(regs.gprs[4]), &regs);
+        error = compat_do_execve(filename, compat_ptr(regs.gprs[3]),
+                                compat_ptr(regs.gprs[4]), &regs);
        if (error == 0)
        {
                current->ptrace &= ~PT_DTRACE;
@@ -1270,226 +797,6 @@ sys32_delete_module(const char __user *name_user, unsigned int flags)
 
 #endif  /* CONFIG_MODULES */
 
-/* Stuff for NFS server syscalls... */
-struct nfsctl_svc32 {
-       u16                     svc32_port;
-       s32                     svc32_nthreads;
-};
-
-struct nfsctl_client32 {
-       s8                      cl32_ident[NFSCLNT_IDMAX+1];
-       s32                     cl32_naddr;
-       struct in_addr          cl32_addrlist[NFSCLNT_ADDRMAX];
-       s32                     cl32_fhkeytype;
-       s32                     cl32_fhkeylen;
-       u8                      cl32_fhkey[NFSCLNT_KEYMAX];
-};
-
-struct nfsctl_export32 {
-       s8                      ex32_client[NFSCLNT_IDMAX+1];
-       s8                      ex32_path[NFS_MAXPATHLEN+1];
-       compat_dev_t    ex32_dev;
-       compat_ino_t    ex32_ino;
-       s32                     ex32_flags;
-       compat_uid_t    ex32_anon_uid;
-       compat_gid_t    ex32_anon_gid;
-};
-
-struct nfsctl_fdparm32 {
-       struct sockaddr         gd32_addr;
-       s8                      gd32_path[NFS_MAXPATHLEN+1];
-       s32                     gd32_version;
-};
-
-struct nfsctl_fsparm32 {
-       struct sockaddr         gd32_addr;
-       s8                      gd32_path[NFS_MAXPATHLEN+1];
-       s32                     gd32_maxlen;
-};
-
-struct nfsctl_arg32 {
-       s32                     ca32_version;   /* safeguard */
-       union {
-               struct nfsctl_svc32     u32_svc;
-               struct nfsctl_client32  u32_client;
-               struct nfsctl_export32  u32_export;
-               struct nfsctl_fdparm32  u32_getfd;
-               struct nfsctl_fsparm32  u32_getfs;
-       } u;
-#define ca32_svc       u.u32_svc
-#define ca32_client    u.u32_client
-#define ca32_export    u.u32_export
-#define ca32_getfd     u.u32_getfd
-#define ca32_getfs     u.u32_getfs
-#define ca32_authd     u.u32_authd
-};
-
-union nfsctl_res32 {
-       __u8                    cr32_getfh[NFS_FHSIZE];
-       struct knfsd_fh         cr32_getfs;
-};
-
-static int nfs_svc32_trans(struct nfsctl_arg *karg, struct nfsctl_arg32 *arg32)
-{
-       int err;
-       
-       err = __get_user(karg->ca_version, &arg32->ca32_version);
-       err |= __get_user(karg->ca_svc.svc_port, &arg32->ca32_svc.svc32_port);
-       err |= __get_user(karg->ca_svc.svc_nthreads, &arg32->ca32_svc.svc32_nthreads);
-       return err;
-}
-
-static int nfs_clnt32_trans(struct nfsctl_arg *karg, struct nfsctl_arg32 *arg32)
-{
-       int err;
-       
-       err = __get_user(karg->ca_version, &arg32->ca32_version);
-       err |= copy_from_user(&karg->ca_client.cl_ident[0],
-                         &arg32->ca32_client.cl32_ident[0],
-                         NFSCLNT_IDMAX);
-       err |= __get_user(karg->ca_client.cl_naddr, &arg32->ca32_client.cl32_naddr);
-       err |= copy_from_user(&karg->ca_client.cl_addrlist[0],
-                         &arg32->ca32_client.cl32_addrlist[0],
-                         (sizeof(struct in_addr) * NFSCLNT_ADDRMAX));
-       err |= __get_user(karg->ca_client.cl_fhkeytype,
-                     &arg32->ca32_client.cl32_fhkeytype);
-       err |= __get_user(karg->ca_client.cl_fhkeylen,
-                     &arg32->ca32_client.cl32_fhkeylen);
-       err |= copy_from_user(&karg->ca_client.cl_fhkey[0],
-                         &arg32->ca32_client.cl32_fhkey[0],
-                         NFSCLNT_KEYMAX);
-       return err;
-}
-
-static int nfs_exp32_trans(struct nfsctl_arg *karg, struct nfsctl_arg32 *arg32)
-{
-       int err;
-       
-       err = __get_user(karg->ca_version, &arg32->ca32_version);
-       err |= copy_from_user(&karg->ca_export.ex_client[0],
-                         &arg32->ca32_export.ex32_client[0],
-                         NFSCLNT_IDMAX);
-       err |= copy_from_user(&karg->ca_export.ex_path[0],
-                         &arg32->ca32_export.ex32_path[0],
-                         NFS_MAXPATHLEN);
-       err |= __get_user(karg->ca_export.ex_dev,
-                     &arg32->ca32_export.ex32_dev);
-       err |= __get_user(karg->ca_export.ex_ino,
-                     &arg32->ca32_export.ex32_ino);
-       err |= __get_user(karg->ca_export.ex_flags,
-                     &arg32->ca32_export.ex32_flags);
-       err |= __get_user(karg->ca_export.ex_anon_uid,
-                     &arg32->ca32_export.ex32_anon_uid);
-       err |= __get_user(karg->ca_export.ex_anon_gid,
-                     &arg32->ca32_export.ex32_anon_gid);
-       karg->ca_export.ex_anon_uid = high2lowuid(karg->ca_export.ex_anon_uid);
-       karg->ca_export.ex_anon_gid = high2lowgid(karg->ca_export.ex_anon_gid);
-       return err;
-}
-
-static int nfs_getfd32_trans(struct nfsctl_arg *karg, struct nfsctl_arg32 *arg32)
-{
-       int err;
-       
-       err = __get_user(karg->ca_version, &arg32->ca32_version);
-       err |= copy_from_user(&karg->ca_getfd.gd_addr,
-                         &arg32->ca32_getfd.gd32_addr,
-                         (sizeof(struct sockaddr)));
-       err |= copy_from_user(&karg->ca_getfd.gd_path,
-                         &arg32->ca32_getfd.gd32_path,
-                         (NFS_MAXPATHLEN+1));
-       err |= __get_user(karg->ca_getfd.gd_version,
-                     &arg32->ca32_getfd.gd32_version);
-       return err;
-}
-
-static int nfs_getfs32_trans(struct nfsctl_arg *karg, struct nfsctl_arg32 *arg32)
-{
-       int err;
-       
-       err = __get_user(karg->ca_version, &arg32->ca32_version);
-       err |= copy_from_user(&karg->ca_getfs.gd_addr,
-                         &arg32->ca32_getfs.gd32_addr,
-                         (sizeof(struct sockaddr)));
-       err |= copy_from_user(&karg->ca_getfs.gd_path,
-                         &arg32->ca32_getfs.gd32_path,
-                         (NFS_MAXPATHLEN+1));
-       err |= __get_user(karg->ca_getfs.gd_maxlen,
-                     &arg32->ca32_getfs.gd32_maxlen);
-       return err;
-}
-
-/* This really doesn't need translations, we are only passing
- * back a union which contains opaque nfs file handle data.
- */
-static int nfs_getfh32_res_trans(union nfsctl_res *kres, union nfsctl_res32 *res32)
-{
-       return copy_to_user(res32, kres, sizeof(*res32)) ? -EFAULT : 0;
-}
-
-long asmlinkage sys32_nfsservctl(int cmd, struct nfsctl_arg32 *arg32, union nfsctl_res32 *res32)
-{
-       struct nfsctl_arg *karg = NULL;
-       union nfsctl_res *kres = NULL;
-       mm_segment_t oldfs;
-       int err;
-
-       karg = kmalloc(sizeof(*karg), GFP_USER);
-       if(!karg)
-               return -ENOMEM;
-       if(res32) {
-               kres = kmalloc(sizeof(*kres), GFP_USER);
-               if(!kres) {
-                       kfree(karg);
-                       return -ENOMEM;
-               }
-       }
-       switch(cmd) {
-       case NFSCTL_SVC:
-               err = nfs_svc32_trans(karg, arg32);
-               break;
-       case NFSCTL_ADDCLIENT:
-               err = nfs_clnt32_trans(karg, arg32);
-               break;
-       case NFSCTL_DELCLIENT:
-               err = nfs_clnt32_trans(karg, arg32);
-               break;
-       case NFSCTL_EXPORT:
-       case NFSCTL_UNEXPORT:
-               err = nfs_exp32_trans(karg, arg32);
-               break;
-       case NFSCTL_GETFD:
-               err = nfs_getfd32_trans(karg, arg32);
-               break;
-       case NFSCTL_GETFS:
-               err = nfs_getfs32_trans(karg, arg32);
-               break;
-       default:
-               err = -EINVAL;
-               break;
-       }
-       if(err)
-               goto done;
-       oldfs = get_fs();
-       set_fs(KERNEL_DS);
-       err = sys_nfsservctl(cmd, karg, kres);
-       set_fs(oldfs);
-
-       if (err)
-               goto done;
-
-       if((cmd == NFSCTL_GETFD) ||
-          (cmd == NFSCTL_GETFS))
-               err = nfs_getfh32_res_trans(kres, res32);
-
-done:
-       if(karg)
-               kfree(karg);
-       if(kres)
-               kfree(kres);
-       return err;
-}
-
 /* Translations due to time_t size differences.  Which affects all
    sorts of things, like timeval and itimerval.  */