1 files changed, 7 insertions, 2 deletions

diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c
index 8e65c7f1f87c..91a6faf811ac 100644
--- a/fs/nfs/mount_clnt.c
+++ b/fs/nfs/mount_clnt.c
@@ -169,6 +169,9 @@ int nfs_mount(struct nfs_mount_request *info)
                 (info->hostname ? info->hostname : "server"),
                         info->dirpath);
 
+        if (strlen(info->dirpath) > MNTPATHLEN)
+                return -ENAMETOOLONG;
+
         if (info->noresvport)
                 args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;
 
@@ -181,7 +184,7 @@ int nfs_mount(struct nfs_mount_request *info)
         else
                 msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC_MNT];
 
-        status = rpc_call_sync(mnt_clnt, &msg, 0);
+        status = rpc_call_sync(mnt_clnt, &msg, RPC_TASK_SOFT|RPC_TASK_TIMEOUT);
         rpc_shutdown_client(mnt_clnt);
 
         if (status < 0)
@@ -242,6 +245,9 @@ void nfs_umount(const struct nfs_mount_request *info)
         struct rpc_clnt *clnt;
         int status;
 
+        if (strlen(info->dirpath) > MNTPATHLEN)
+                return;
+
         if (info->noresvport)
                 args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;
 
@@ -283,7 +289,6 @@ static void encode_mntdirpath(struct xdr_stream *xdr, const char *pathname)
         const u32 pathname_len = strlen(pathname);
         __be32 *p;
 
-        BUG_ON(pathname_len > MNTPATHLEN);
         p = xdr_reserve_space(xdr, 4 + pathname_len);
         xdr_encode_opaque(p, pathname, pathname_len);
 }