This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / coda / upcall.c

diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index 0d6459e..569e144 100644 (file)
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -555,11 +555,6 @@ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
                goto exit;
         }
 
-        if (data->vi.out_size > VC_MAXDATASIZE) {
-               error = -EINVAL;
-               goto exit;
-       }
-
         inp->coda_ioctl.VFid = *fid;
     
         /* the cmd field was mutated by increasing its size field to
@@ -588,26 +583,19 @@ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
                       error, coda_f2s(fid));
                goto exit; 
        }
-
-       if (outsize < (long)outp->coda_ioctl.data + outp->coda_ioctl.len) {
-               error = -EINVAL;
-               goto exit;
-       }
         
        /* Copy out the OUT buffer. */
         if (outp->coda_ioctl.len > data->vi.out_size) {
                error = -EINVAL;
-               goto exit;
+        } else {
+               if (copy_to_user(data->vi.out, 
+                                (char *)outp + (long)outp->coda_ioctl.data, 
+                                data->vi.out_size)) {
+                       error = -EFAULT;
+                       goto exit;
+               }
         }
 
-       /* Copy out the OUT buffer. */
-       if (copy_to_user(data->vi.out, 
-                        (char *)outp + (long)outp->coda_ioctl.data, 
-                        outp->coda_ioctl.len)) {
-               error = -EFAULT;
-               goto exit;
-       }
-
  exit:
        CODA_FREE(inp, insize);
        return error;