Commit 28d79ea3 authored by Trond Myklebust's avatar Trond Myklebust

NFS: Remove the BUG_ON() in the mount code

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f48407dd
...@@ -169,6 +169,9 @@ int nfs_mount(struct nfs_mount_request *info) ...@@ -169,6 +169,9 @@ int nfs_mount(struct nfs_mount_request *info)
(info->hostname ? info->hostname : "server"), (info->hostname ? info->hostname : "server"),
info->dirpath); info->dirpath);
if (strlen(info->dirpath) > MNTPATHLEN)
return -ENAMETOOLONG;
if (info->noresvport) if (info->noresvport)
args.flags |= RPC_CLNT_CREATE_NONPRIVPORT; args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;
...@@ -242,6 +245,9 @@ void nfs_umount(const struct nfs_mount_request *info) ...@@ -242,6 +245,9 @@ void nfs_umount(const struct nfs_mount_request *info)
struct rpc_clnt *clnt; struct rpc_clnt *clnt;
int status; int status;
if (strlen(info->dirpath) > MNTPATHLEN)
return;
if (info->noresvport) if (info->noresvport)
args.flags |= RPC_CLNT_CREATE_NONPRIVPORT; args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;
...@@ -283,7 +289,6 @@ static void encode_mntdirpath(struct xdr_stream *xdr, const char *pathname) ...@@ -283,7 +289,6 @@ static void encode_mntdirpath(struct xdr_stream *xdr, const char *pathname)
const u32 pathname_len = strlen(pathname); const u32 pathname_len = strlen(pathname);
__be32 *p; __be32 *p;
BUG_ON(pathname_len > MNTPATHLEN);
p = xdr_reserve_space(xdr, 4 + pathname_len); p = xdr_reserve_space(xdr, 4 + pathname_len);
xdr_encode_opaque(p, pathname, pathname_len); xdr_encode_opaque(p, pathname, pathname_len);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment