Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / fs / nfsd / nfsxdr.c

diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index cb3e7fadb772127975898e14a43c6bd3dd4c4d92..986f9b32083c655f792ada9476d3658a71bb37d7 100644 (file)
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -523,6 +523,10 @@ nfssvc_encode_entry(void *ccdv, const char *name,
                cd->common.err = nfserr_toosmall;
                return -EINVAL;
        }
+       if (ino > ~((u32) 0)) {
+               cd->common.err = nfserr_fbig;
+               return -EINVAL;
+       }
        *p++ = xdr_one;                         /* mark entry present */
        *p++ = htonl((u32) ino);                /* file id */
        p    = xdr_encode_array(p, name, namlen);/* name length & name */