signed comparison for maxsymlinklen

SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.104
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.104

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 5693ea9..25ee97d 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.103 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.104 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1490,9 +1490,11 @@ ufs_readlink(ap)
 {
        register struct vnode *vp = ap->a_vp;
        register struct inode *ip = VTOI(vp);
 {
        register struct vnode *vp = ap->a_vp;
        register struct inode *ip = VTOI(vp);

+       int isize;

 
 

-       if (ip->i_size < vp->v_mount->mnt_maxsymlinklen) {
-               uiomove((char *)ip->i_shortlink, (int)ip->i_size, ap->a_uio);
+       isize = ip->i_size;
+       if (isize < vp->v_mount->mnt_maxsymlinklen) {
+               uiomove((char *)ip->i_shortlink, isize, ap->a_uio);

                return (0);
        }
        return (VOP_READ(vp, ap->a_uio, 0, ap->a_cred));
                return (0);
        }
        return (VOP_READ(vp, ap->a_uio, 0, ap->a_cred));

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 5693ea9..25ee97d 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.103 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.104 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1490,9 +1490,11 @@ ufs_readlink(ap)
 {
        register struct vnode *vp = ap->a_vp;
        register struct inode *ip = VTOI(vp);
 {
        register struct vnode *vp = ap->a_vp;
        register struct inode *ip = VTOI(vp);

+       int isize;

 
 

-       if (ip->i_size < vp->v_mount->mnt_maxsymlinklen) {
-               uiomove((char *)ip->i_shortlink, (int)ip->i_size, ap->a_uio);
+       isize = ip->i_size;
+       if (isize < vp->v_mount->mnt_maxsymlinklen) {
+               uiomove((char *)ip->i_shortlink, isize, ap->a_uio);

                return (0);
        }
        return (VOP_READ(vp, ap->a_uio, 0, ap->a_cred));
                return (0);
        }
        return (VOP_READ(vp, ap->a_uio, 0, ap->a_cred));