1 files changed, 295 insertions, 42 deletions
diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c
index ca905a5bb1ba..38ef9eaec407 100644
--- a/fs/nfs/mount_clnt.c
+++ b/fs/nfs/mount_clnt.c
@@ -20,8 +20,116 @@
 # define NFSDBG_FACILITY        NFSDBG_MOUNT
 #endif
+/*
+ * Defined by RFC 1094, section A.3; and RFC 1813, section 5.1.4
+ */
+#define MNTPATHLEN              (1024)
+/*
+ * XDR data type sizes
+ */
+#define encode_dirpath_sz       (1 + XDR_QUADLEN(MNTPATHLEN))
+#define MNT_status_sz           (1)
+#define MNT_fhs_status_sz       (1)
+#define MNT_fhandle_sz          XDR_QUADLEN(NFS2_FHSIZE)
+#define MNT_fhandle3_sz         (1 + XDR_QUADLEN(NFS3_FHSIZE))
+#define MNT_authflav3_sz        (1 + NFS_MAX_SECFLAVORS)
+/*
+ * XDR argument and result sizes
+ */
+#define MNT_enc_dirpath_sz      encode_dirpath_sz
+#define MNT_dec_mountres_sz     (MNT_status_sz + MNT_fhandle_sz)
+#define MNT_dec_mountres3_sz    (MNT_status_sz + MNT_fhandle_sz + \
+                                 MNT_authflav3_sz)
+/*
+ * Defined by RFC 1094, section A.5
+ */
+enum {
+        MOUNTPROC_NULL          = 0,
+        MOUNTPROC_MNT           = 1,
+        MOUNTPROC_DUMP          = 2,
+        MOUNTPROC_UMNT          = 3,
+        MOUNTPROC_UMNTALL       = 4,
+        MOUNTPROC_EXPORT        = 5,
+};
+/*
+ * Defined by RFC 1813, section 5.2
+ */
+enum {
+        MOUNTPROC3_NULL         = 0,
+        MOUNTPROC3_MNT          = 1,
+        MOUNTPROC3_DUMP         = 2,
+        MOUNTPROC3_UMNT         = 3,
+        MOUNTPROC3_UMNTALL      = 4,
+        MOUNTPROC3_EXPORT       = 5,
+};
 static struct rpc_program       mnt_program;
+/*
+ * Defined by OpenGroup XNFS Version 3W, chapter 8
+ */
+enum mountstat {
+        MNT_OK                  = 0,
+        MNT_EPERM               = 1,
+        MNT_ENOENT              = 2,
+        MNT_EACCES              = 13,
+        MNT_EINVAL              = 22,
+};
+static struct {
+        u32 status;
+        int errno;
+} mnt_errtbl[] = {
+        { .status = MNT_OK,                     .errno = 0,             },
+        { .status = MNT_EPERM,                  .errno = -EPERM,        },
+        { .status = MNT_ENOENT,                 .errno = -ENOENT,       },
+        { .status = MNT_EACCES,                 .errno = -EACCES,       },
+        { .status = MNT_EINVAL,                 .errno = -EINVAL,       },
+};
+/*
+ * Defined by RFC 1813, section 5.1.5
+ */
+enum mountstat3 {
+        MNT3_OK                 = 0,            /* no error */
+        MNT3ERR_PERM            = 1,            /* Not owner */
+        MNT3ERR_NOENT           = 2,            /* No such file or directory */
+        MNT3ERR_IO              = 5,            /* I/O error */
+        MNT3ERR_ACCES           = 13,           /* Permission denied */
+        MNT3ERR_NOTDIR          = 20,           /* Not a directory */
+        MNT3ERR_INVAL           = 22,           /* Invalid argument */
+        MNT3ERR_NAMETOOLONG     = 63,           /* Filename too long */
+        MNT3ERR_NOTSUPP         = 10004,        /* Operation not supported */
+        MNT3ERR_SERVERFAULT     = 10006,        /* A failure on the server */
+};
+static struct {
+        u32 status;
+        int errno;
+} mnt3_errtbl[] = {
+        { .status = MNT3_OK,                    .errno = 0,             },
+        { .status = MNT3ERR_PERM,               .errno = -EPERM,        },
+        { .status = MNT3ERR_NOENT,              .errno = -ENOENT,       },
+        { .status = MNT3ERR_IO,                 .errno = -EIO,          },
+        { .status = MNT3ERR_ACCES,              .errno = -EACCES,       },
+        { .status = MNT3ERR_NOTDIR,             .errno = -ENOTDIR,      },
+        { .status = MNT3ERR_INVAL,              .errno = -EINVAL,       },
+        { .status = MNT3ERR_NAMETOOLONG,        .errno = -ENAMETOOLONG, },
+        { .status = MNT3ERR_NOTSUPP,            .errno = -ENOTSUPP,     },
+        { .status = MNT3ERR_SERVERFAULT,        .errno = -ESERVERFAULT, },
+};
+struct mountres {
+        int errno;
+        struct nfs_fh *fh;
+        unsigned int *auth_count;
+        rpc_authflavor_t *auth_flavors;
+};
 struct mnt_fhstatus {
        u32 status;
        struct nfs_fh *fh;
@@ -35,8 +143,10 @@ struct mnt_fhstatus {
 */
 int nfs_mount(struct nfs_mount_request *info)
 {
-        struct mnt_fhstatus     result = {
+        struct mountres result = {
-                .fh             = info->fh
+                .fh             = info->fh,
+                .auth_count     = info->auth_flav_len,
+                .auth_flavors   = info->auth_flavs,
        };
        struct rpc_message msg  = {
                .rpc_argp       = info->dirpath,
@@ -68,14 +178,14 @@ int nfs_mount(struct nfs_mount_request *info)
        if (info->version == NFS_MNT3_VERSION)
                msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC3_MNT];
        else
-                msg.rpc_proc = &mnt_clnt->cl_procinfo[MNTPROC_MNT];
+                msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC_MNT];
        status = rpc_call_sync(mnt_clnt, &msg, 0);
        rpc_shutdown_client(mnt_clnt);
        if (status < 0)
                goto out_call_err;
-        if (result.status != 0)
+        if (result.errno != 0)
                goto out_mnt_err;
        dprintk("NFS: MNT request succeeded\n");
@@ -86,72 +196,215 @@ out:
 out_clnt_err:
        status = PTR_ERR(mnt_clnt);
-        dprintk("NFS: failed to create RPC client, status=%d\n", status);
+        dprintk("NFS: failed to create MNT RPC client, status=%d\n", status);
        goto out;
 out_call_err:
-        dprintk("NFS: failed to start MNT request, status=%d\n", status);
+        dprintk("NFS: MNT request failed, status=%d\n", status);
        goto out;
 out_mnt_err:
-        dprintk("NFS: MNT server returned result %d\n", result.status);
+        dprintk("NFS: MNT server returned result %d\n", result.errno);
-        status = nfs_stat_to_errno(result.status);
+        status = result.errno;
        goto out;
 }
 /*
 * XDR encode/decode functions for MOUNT
 */
-static int xdr_encode_dirpath(struct rpc_rqst *req, __be32 *p,
-                              const char *path)
+static int encode_mntdirpath(struct xdr_stream *xdr, const char *pathname)
+{
+        const u32 pathname_len = strlen(pathname);
+        __be32 *p;
+        if (unlikely(pathname_len > MNTPATHLEN))
+                return -EIO;
+        p = xdr_reserve_space(xdr, sizeof(u32) + pathname_len);
+        if (unlikely(p == NULL))
+                return -EIO;
+        xdr_encode_opaque(p, pathname, pathname_len);
+        return 0;
+}
+static int mnt_enc_dirpath(struct rpc_rqst *req, __be32 *p,
+                           const char *dirpath)
+{
+        struct xdr_stream xdr;
+        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+        return encode_mntdirpath(&xdr, dirpath);
+}
+/*
+ * RFC 1094: "A non-zero status indicates some sort of error.  In this
+ * case, the status is a UNIX error number."  This can be problematic
+ * if the server and client use different errno values for the same
+ * error.
+ *
+ * However, the OpenGroup XNFS spec provides a simple mapping that is
+ * independent of local errno values on the server and the client.
+ */
+static int decode_status(struct xdr_stream *xdr, struct mountres *res)
 {
-        p = xdr_encode_string(p, path);
+        unsigned int i;
+        u32 status;
+        __be32 *p;
+        p = xdr_inline_decode(xdr, sizeof(status));
+        if (unlikely(p == NULL))
+                return -EIO;
+        status = ntohl(*p);
-        req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
+        for (i = 0; i <= ARRAY_SIZE(mnt_errtbl); i++) {
+                if (mnt_errtbl[i].status == status) {
+                        res->errno = mnt_errtbl[i].errno;
+                        return 0;
+                }
+        }
+        dprintk("NFS: unrecognized MNT status code: %u\n", status);
+        res->errno = -EACCES;
        return 0;
 }
-static int xdr_decode_fhstatus(struct rpc_rqst *req, __be32 *p,
+static int decode_fhandle(struct xdr_stream *xdr, struct mountres *res)
-                               struct mnt_fhstatus *res)
 {
        struct nfs_fh *fh = res->fh;
+        __be32 *p;
+        p = xdr_inline_decode(xdr, NFS2_FHSIZE);
+        if (unlikely(p == NULL))
+                return -EIO;
+        fh->size = NFS2_FHSIZE;
+        memcpy(fh->data, p, NFS2_FHSIZE);
+        return 0;
+}
+static int mnt_dec_mountres(struct rpc_rqst *req, __be32 *p,
+                            struct mountres *res)
+{
+        struct xdr_stream xdr;
+        int status;
+        xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
+        status = decode_status(&xdr, res);
+        if (unlikely(status != 0 || res->errno != 0))
+                return status;
+        return decode_fhandle(&xdr, res);
+}
+static int decode_fhs_status(struct xdr_stream *xdr, struct mountres *res)
+{
+        unsigned int i;
+        u32 status;
+        __be32 *p;
-        if ((res->status = ntohl(*p++)) == 0) {
+        p = xdr_inline_decode(xdr, sizeof(status));
-                fh->size = NFS2_FHSIZE;
+        if (unlikely(p == NULL))
-                memcpy(fh->data, p, NFS2_FHSIZE);
+                return -EIO;
+        status = ntohl(*p);
+        for (i = 0; i <= ARRAY_SIZE(mnt3_errtbl); i++) {
+                if (mnt3_errtbl[i].status == status) {
+                        res->errno = mnt3_errtbl[i].errno;
+                        return 0;
+                }
        }
+        dprintk("NFS: unrecognized MNT3 status code: %u\n", status);
+        res->errno = -EACCES;
        return 0;
 }
-static int xdr_decode_fhstatus3(struct rpc_rqst *req, __be32 *p,
+static int decode_fhandle3(struct xdr_stream *xdr, struct mountres *res)
-                                struct mnt_fhstatus *res)
 {
        struct nfs_fh *fh = res->fh;
-        unsigned size;
+        u32 size;
+        __be32 *p;
-        if ((res->status = ntohl(*p++)) == 0) {
-                size = ntohl(*p++);
+        p = xdr_inline_decode(xdr, sizeof(size));
-                if (size <= NFS3_FHSIZE && size != 0) {
+        if (unlikely(p == NULL))
-                        fh->size = size;
+                return -EIO;
-                        memcpy(fh->data, p, size);
-                } else
+        size = ntohl(*p++);
-                        res->status = -EBADHANDLE;
+        if (size > NFS3_FHSIZE || size == 0)
+                return -EIO;
+        p = xdr_inline_decode(xdr, size);
+        if (unlikely(p == NULL))
+                return -EIO;
+        fh->size = size;
+        memcpy(fh->data, p, size);
+        return 0;
+}
+static int decode_auth_flavors(struct xdr_stream *xdr, struct mountres *res)
+{
+        rpc_authflavor_t *flavors = res->auth_flavors;
+        unsigned int *count = res->auth_count;
+        u32 entries, i;
+        __be32 *p;
+        if (*count == 0)
+                return 0;
+        p = xdr_inline_decode(xdr, sizeof(entries));
+        if (unlikely(p == NULL))
+                return -EIO;
+        entries = ntohl(*p);
+        dprintk("NFS: received %u auth flavors\n", entries);
+        if (entries > NFS_MAX_SECFLAVORS)
+                entries = NFS_MAX_SECFLAVORS;
+        p = xdr_inline_decode(xdr, sizeof(u32) * entries);
+        if (unlikely(p == NULL))
+                return -EIO;
+        if (entries > *count)
+                entries = *count;
+        for (i = 0; i < entries; i++) {
+                flavors[i] = ntohl(*p++);
+                dprintk("NFS:\tflavor %u: %d\n", i, flavors[i]);
        }
+        *count = i;
        return 0;
 }
-#define MNT_dirpath_sz          (1 + 256)
+static int mnt_dec_mountres3(struct rpc_rqst *req, __be32 *p,
-#define MNT_fhstatus_sz         (1 + 8)
+                             struct mountres *res)
-#define MNT_fhstatus3_sz        (1 + 16)
+{
+        struct xdr_stream xdr;
+        int status;
+        xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
+        status = decode_fhs_status(&xdr, res);
+        if (unlikely(status != 0 || res->errno != 0))
+                return status;
+        status = decode_fhandle3(&xdr, res);
+        if (unlikely(status != 0)) {
+                res->errno = -EBADHANDLE;
+                return 0;
+        }
+        return decode_auth_flavors(&xdr, res);
+}
 static struct rpc_procinfo mnt_procedures[] = {
-        [MNTPROC_MNT] = {
+        [MOUNTPROC_MNT] = {
-                .p_proc         = MNTPROC_MNT,
+                .p_proc         = MOUNTPROC_MNT,
-                .p_encode       = (kxdrproc_t) xdr_encode_dirpath,
+                .p_encode       = (kxdrproc_t)mnt_enc_dirpath,
-                .p_decode       = (kxdrproc_t) xdr_decode_fhstatus,
+                .p_decode       = (kxdrproc_t)mnt_dec_mountres,
-                .p_arglen       = MNT_dirpath_sz,
+                .p_arglen       = MNT_enc_dirpath_sz,
-                .p_replen       = MNT_fhstatus_sz,
+                .p_replen       = MNT_dec_mountres_sz,
-                .p_statidx      = MNTPROC_MNT,
+                .p_statidx      = MOUNTPROC_MNT,
                .p_name         = "MOUNT",
        },
 };
@@ -159,10 +412,10 @@ static struct rpc_procinfo mnt_procedures[] = {
 static struct rpc_procinfo mnt3_procedures[] = {
        [MOUNTPROC3_MNT] = {
                .p_proc         = MOUNTPROC3_MNT,
-                .p_encode       = (kxdrproc_t) xdr_encode_dirpath,
+                .p_encode       = (kxdrproc_t)mnt_enc_dirpath,
-                .p_decode       = (kxdrproc_t) xdr_decode_fhstatus3,
+                .p_decode       = (kxdrproc_t)mnt_dec_mountres3,
-                .p_arglen       = MNT_dirpath_sz,
+                .p_arglen       = MNT_enc_dirpath_sz,
-                .p_replen       = MNT_fhstatus3_sz,
+                .p_replen       = MNT_dec_mountres3_sz,
                .p_statidx      = MOUNTPROC3_MNT,
                .p_name         = "MOUNT",
        },

diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c index ca905a5bb1ba..38ef9eaec407 100644 --- a/fs/nfs/mount_clnt.c +++ b/fs/nfs/mount_clnt.c
@@ -20,8 +20,116 @@
20	# define NFSDBG_FACILITY NFSDBG_MOUNT	20	# define NFSDBG_FACILITY NFSDBG_MOUNT
21	#endif	21	#endif
22		22
		23	/*
		24	* Defined by RFC 1094, section A.3; and RFC 1813, section 5.1.4
		25	*/
		26	#define MNTPATHLEN (1024)
		27
		28	/*
		29	* XDR data type sizes
		30	*/
		31	#define encode_dirpath_sz (1 + XDR_QUADLEN(MNTPATHLEN))
		32	#define MNT_status_sz (1)
		33	#define MNT_fhs_status_sz (1)
		34	#define MNT_fhandle_sz XDR_QUADLEN(NFS2_FHSIZE)
		35	#define MNT_fhandle3_sz (1 + XDR_QUADLEN(NFS3_FHSIZE))
		36	#define MNT_authflav3_sz (1 + NFS_MAX_SECFLAVORS)
		37
		38	/*
		39	* XDR argument and result sizes
		40	*/
		41	#define MNT_enc_dirpath_sz encode_dirpath_sz
		42	#define MNT_dec_mountres_sz (MNT_status_sz + MNT_fhandle_sz)
		43	#define MNT_dec_mountres3_sz (MNT_status_sz + MNT_fhandle_sz + \
		44	MNT_authflav3_sz)
		45
		46	/*
		47	* Defined by RFC 1094, section A.5
		48	*/
		49	enum {
		50	MOUNTPROC_NULL = 0,
		51	MOUNTPROC_MNT = 1,
		52	MOUNTPROC_DUMP = 2,
		53	MOUNTPROC_UMNT = 3,
		54	MOUNTPROC_UMNTALL = 4,
		55	MOUNTPROC_EXPORT = 5,
		56	};
		57
		58	/*
		59	* Defined by RFC 1813, section 5.2
		60	*/
		61	enum {
		62	MOUNTPROC3_NULL = 0,
		63	MOUNTPROC3_MNT = 1,
		64	MOUNTPROC3_DUMP = 2,
		65	MOUNTPROC3_UMNT = 3,
		66	MOUNTPROC3_UMNTALL = 4,
		67	MOUNTPROC3_EXPORT = 5,
		68	};
		69
23	static struct rpc_program mnt_program;	70	static struct rpc_program mnt_program;
24		71
		72	/*
		73	* Defined by OpenGroup XNFS Version 3W, chapter 8
		74	*/
		75	enum mountstat {
		76	MNT_OK = 0,
		77	MNT_EPERM = 1,
		78	MNT_ENOENT = 2,
		79	MNT_EACCES = 13,
		80	MNT_EINVAL = 22,
		81	};
		82
		83	static struct {
		84	u32 status;
		85	int errno;
		86	} mnt_errtbl[] = {
		87	{ .status = MNT_OK, .errno = 0, },
		88	{ .status = MNT_EPERM, .errno = -EPERM, },
		89	{ .status = MNT_ENOENT, .errno = -ENOENT, },
		90	{ .status = MNT_EACCES, .errno = -EACCES, },
		91	{ .status = MNT_EINVAL, .errno = -EINVAL, },
		92	};
		93
		94	/*
		95	* Defined by RFC 1813, section 5.1.5
		96	*/
		97	enum mountstat3 {
		98	MNT3_OK = 0, /* no error */
		99	MNT3ERR_PERM = 1, /* Not owner */
		100	MNT3ERR_NOENT = 2, /* No such file or directory */
		101	MNT3ERR_IO = 5, /* I/O error */
		102	MNT3ERR_ACCES = 13, /* Permission denied */
		103	MNT3ERR_NOTDIR = 20, /* Not a directory */
		104	MNT3ERR_INVAL = 22, /* Invalid argument */
		105	MNT3ERR_NAMETOOLONG = 63, /* Filename too long */
		106	MNT3ERR_NOTSUPP = 10004, /* Operation not supported */
		107	MNT3ERR_SERVERFAULT = 10006, /* A failure on the server */
		108	};
		109
		110	static struct {
		111	u32 status;
		112	int errno;
		113	} mnt3_errtbl[] = {
		114	{ .status = MNT3_OK, .errno = 0, },
		115	{ .status = MNT3ERR_PERM, .errno = -EPERM, },
		116	{ .status = MNT3ERR_NOENT, .errno = -ENOENT, },
		117	{ .status = MNT3ERR_IO, .errno = -EIO, },
		118	{ .status = MNT3ERR_ACCES, .errno = -EACCES, },
		119	{ .status = MNT3ERR_NOTDIR, .errno = -ENOTDIR, },
		120	{ .status = MNT3ERR_INVAL, .errno = -EINVAL, },
		121	{ .status = MNT3ERR_NAMETOOLONG, .errno = -ENAMETOOLONG, },
		122	{ .status = MNT3ERR_NOTSUPP, .errno = -ENOTSUPP, },
		123	{ .status = MNT3ERR_SERVERFAULT, .errno = -ESERVERFAULT, },
		124	};
		125
		126	struct mountres {
		127	int errno;
		128	struct nfs_fh *fh;
		129	unsigned int *auth_count;
		130	rpc_authflavor_t *auth_flavors;
		131	};
		132
25	struct mnt_fhstatus {	133	struct mnt_fhstatus {
26	u32 status;	134	u32 status;
27	struct nfs_fh *fh;	135	struct nfs_fh *fh;
@@ -35,8 +143,10 @@ struct mnt_fhstatus {
35	*/	143	*/
36	int nfs_mount(struct nfs_mount_request *info)	144	int nfs_mount(struct nfs_mount_request *info)
37	{	145	{
38	struct mnt_fhstatus result = {	146	struct mountres result = {
39	.fh = info->fh	147	.fh = info->fh,
		148	.auth_count = info->auth_flav_len,
		149	.auth_flavors = info->auth_flavs,
40	};	150	};
41	struct rpc_message msg = {	151	struct rpc_message msg = {
42	.rpc_argp = info->dirpath,	152	.rpc_argp = info->dirpath,
@@ -68,14 +178,14 @@ int nfs_mount(struct nfs_mount_request *info)
68	if (info->version == NFS_MNT3_VERSION)	178	if (info->version == NFS_MNT3_VERSION)
69	msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC3_MNT];	179	msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC3_MNT];
70	else	180	else
71	msg.rpc_proc = &mnt_clnt->cl_procinfo[MNTPROC_MNT];	181	msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC_MNT];
72		182
73	status = rpc_call_sync(mnt_clnt, &msg, 0);	183	status = rpc_call_sync(mnt_clnt, &msg, 0);
74	rpc_shutdown_client(mnt_clnt);	184	rpc_shutdown_client(mnt_clnt);
75		185
76	if (status < 0)	186	if (status < 0)
77	goto out_call_err;	187	goto out_call_err;
78	if (result.status != 0)	188	if (result.errno != 0)
79	goto out_mnt_err;	189	goto out_mnt_err;
80		190
81	dprintk("NFS: MNT request succeeded\n");	191	dprintk("NFS: MNT request succeeded\n");
@@ -86,72 +196,215 @@ out:
86		196
87	out_clnt_err:	197	out_clnt_err:
88	status = PTR_ERR(mnt_clnt);	198	status = PTR_ERR(mnt_clnt);
89	dprintk("NFS: failed to create RPC client, status=%d\n", status);	199	dprintk("NFS: failed to create MNT RPC client, status=%d\n", status);
90	goto out;	200	goto out;
91		201
92	out_call_err:	202	out_call_err:
93	dprintk("NFS: failed to start MNT request, status=%d\n", status);	203	dprintk("NFS: MNT request failed, status=%d\n", status);
94	goto out;	204	goto out;
95		205
96	out_mnt_err:	206	out_mnt_err:
97	dprintk("NFS: MNT server returned result %d\n", result.status);	207	dprintk("NFS: MNT server returned result %d\n", result.errno);
98	status = nfs_stat_to_errno(result.status);	208	status = result.errno;
99	goto out;	209	goto out;
100	}	210	}
101		211
102	/*	212	/*
103	* XDR encode/decode functions for MOUNT	213	* XDR encode/decode functions for MOUNT
104	*/	214	*/
105	static int xdr_encode_dirpath(struct rpc_rqst req, __be32 p,	215
106	const char *path)	216	static int encode_mntdirpath(struct xdr_stream xdr, const char pathname)
		217	{
		218	const u32 pathname_len = strlen(pathname);
		219	__be32 *p;
		220
		221	if (unlikely(pathname_len > MNTPATHLEN))
		222	return -EIO;
		223
		224	p = xdr_reserve_space(xdr, sizeof(u32) + pathname_len);
		225	if (unlikely(p == NULL))
		226	return -EIO;
		227	xdr_encode_opaque(p, pathname, pathname_len);
		228
		229	return 0;
		230	}
		231
		232	static int mnt_enc_dirpath(struct rpc_rqst req, __be32 p,
		233	const char *dirpath)
		234	{
		235	struct xdr_stream xdr;
		236
		237	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
		238	return encode_mntdirpath(&xdr, dirpath);
		239	}
		240
		241	/*
		242	* RFC 1094: "A non-zero status indicates some sort of error. In this
		243	* case, the status is a UNIX error number." This can be problematic
		244	* if the server and client use different errno values for the same
		245	* error.
		246	*
		247	* However, the OpenGroup XNFS spec provides a simple mapping that is
		248	* independent of local errno values on the server and the client.
		249	*/
		250	static int decode_status(struct xdr_stream xdr, struct mountres res)
107	{	251	{
108	p = xdr_encode_string(p, path);	252	unsigned int i;
		253	u32 status;
		254	__be32 *p;
		255
		256	p = xdr_inline_decode(xdr, sizeof(status));
		257	if (unlikely(p == NULL))
		258	return -EIO;
		259	status = ntohl(*p);
109		260
110	req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);	261	for (i = 0; i <= ARRAY_SIZE(mnt_errtbl); i++) {
		262	if (mnt_errtbl[i].status == status) {
		263	res->errno = mnt_errtbl[i].errno;
		264	return 0;
		265	}
		266	}
		267
		268	dprintk("NFS: unrecognized MNT status code: %u\n", status);
		269	res->errno = -EACCES;
111	return 0;	270	return 0;
112	}	271	}
113		272
114	static int xdr_decode_fhstatus(struct rpc_rqst req, __be32 p,	273	static int decode_fhandle(struct xdr_stream xdr, struct mountres res)
115	struct mnt_fhstatus *res)
116	{	274	{
117	struct nfs_fh *fh = res->fh;	275	struct nfs_fh *fh = res->fh;
		276	__be32 *p;
		277
		278	p = xdr_inline_decode(xdr, NFS2_FHSIZE);
		279	if (unlikely(p == NULL))
		280	return -EIO;
		281
		282	fh->size = NFS2_FHSIZE;
		283	memcpy(fh->data, p, NFS2_FHSIZE);
		284	return 0;
		285	}
		286
		287	static int mnt_dec_mountres(struct rpc_rqst req, __be32 p,
		288	struct mountres *res)
		289	{
		290	struct xdr_stream xdr;
		291	int status;
		292
		293	xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
		294
		295	status = decode_status(&xdr, res);
		296	if (unlikely(status != 0 \|\| res->errno != 0))
		297	return status;
		298	return decode_fhandle(&xdr, res);
		299	}
		300
		301	static int decode_fhs_status(struct xdr_stream xdr, struct mountres res)
		302	{
		303	unsigned int i;
		304	u32 status;
		305	__be32 *p;
118		306
119	if ((res->status = ntohl(*p++)) == 0) {	307	p = xdr_inline_decode(xdr, sizeof(status));
120	fh->size = NFS2_FHSIZE;	308	if (unlikely(p == NULL))
121	memcpy(fh->data, p, NFS2_FHSIZE);	309	return -EIO;
		310	status = ntohl(*p);
		311
		312	for (i = 0; i <= ARRAY_SIZE(mnt3_errtbl); i++) {
		313	if (mnt3_errtbl[i].status == status) {
		314	res->errno = mnt3_errtbl[i].errno;
		315	return 0;
		316	}
122	}	317	}
		318
		319	dprintk("NFS: unrecognized MNT3 status code: %u\n", status);
		320	res->errno = -EACCES;
123	return 0;	321	return 0;
124	}	322	}
125		323
126	static int xdr_decode_fhstatus3(struct rpc_rqst req, __be32 p,	324	static int decode_fhandle3(struct xdr_stream xdr, struct mountres res)
127	struct mnt_fhstatus *res)
128	{	325	{
129	struct nfs_fh *fh = res->fh;	326	struct nfs_fh *fh = res->fh;
130	unsigned size;	327	u32 size;
131		328	__be32 *p;
132	if ((res->status = ntohl(*p++)) == 0) {	329
133	size = ntohl(*p++);	330	p = xdr_inline_decode(xdr, sizeof(size));
134	if (size <= NFS3_FHSIZE && size != 0) {	331	if (unlikely(p == NULL))
135	fh->size = size;	332	return -EIO;
136	memcpy(fh->data, p, size);	333
137	} else	334	size = ntohl(*p++);
138	res->status = -EBADHANDLE;	335	if (size > NFS3_FHSIZE \|\| size == 0)
		336	return -EIO;
		337
		338	p = xdr_inline_decode(xdr, size);
		339	if (unlikely(p == NULL))
		340	return -EIO;
		341
		342	fh->size = size;
		343	memcpy(fh->data, p, size);
		344	return 0;
		345	}
		346
		347	static int decode_auth_flavors(struct xdr_stream xdr, struct mountres res)
		348	{
		349	rpc_authflavor_t *flavors = res->auth_flavors;
		350	unsigned int *count = res->auth_count;
		351	u32 entries, i;
		352	__be32 *p;
		353
		354	if (*count == 0)
		355	return 0;
		356
		357	p = xdr_inline_decode(xdr, sizeof(entries));
		358	if (unlikely(p == NULL))
		359	return -EIO;
		360	entries = ntohl(*p);
		361	dprintk("NFS: received %u auth flavors\n", entries);
		362	if (entries > NFS_MAX_SECFLAVORS)
		363	entries = NFS_MAX_SECFLAVORS;
		364
		365	p = xdr_inline_decode(xdr, sizeof(u32) * entries);
		366	if (unlikely(p == NULL))
		367	return -EIO;
		368
		369	if (entries > *count)
		370	entries = *count;
		371
		372	for (i = 0; i < entries; i++) {
		373	flavors[i] = ntohl(*p++);
		374	dprintk("NFS:\tflavor %u: %d\n", i, flavors[i]);
139	}	375	}
		376	*count = i;
		377
140	return 0;	378	return 0;
141	}	379	}
142		380
143	#define MNT_dirpath_sz (1 + 256)	381	static int mnt_dec_mountres3(struct rpc_rqst req, __be32 p,
144	#define MNT_fhstatus_sz (1 + 8)	382	struct mountres *res)
145	#define MNT_fhstatus3_sz (1 + 16)	383	{
		384	struct xdr_stream xdr;
		385	int status;
		386
		387	xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
		388
		389	status = decode_fhs_status(&xdr, res);
		390	if (unlikely(status != 0 \|\| res->errno != 0))
		391	return status;
		392	status = decode_fhandle3(&xdr, res);
		393	if (unlikely(status != 0)) {
		394	res->errno = -EBADHANDLE;
		395	return 0;
		396	}
		397	return decode_auth_flavors(&xdr, res);
		398	}
146		399
147	static struct rpc_procinfo mnt_procedures[] = {	400	static struct rpc_procinfo mnt_procedures[] = {
148	[MNTPROC_MNT] = {	401	[MOUNTPROC_MNT] = {
149	.p_proc = MNTPROC_MNT,	402	.p_proc = MOUNTPROC_MNT,
150	.p_encode = (kxdrproc_t) xdr_encode_dirpath,	403	.p_encode = (kxdrproc_t)mnt_enc_dirpath,
151	.p_decode = (kxdrproc_t) xdr_decode_fhstatus,	404	.p_decode = (kxdrproc_t)mnt_dec_mountres,
152	.p_arglen = MNT_dirpath_sz,	405	.p_arglen = MNT_enc_dirpath_sz,
153	.p_replen = MNT_fhstatus_sz,	406	.p_replen = MNT_dec_mountres_sz,
154	.p_statidx = MNTPROC_MNT,	407	.p_statidx = MOUNTPROC_MNT,
155	.p_name = "MOUNT",	408	.p_name = "MOUNT",
156	},	409	},
157	};	410	};
@@ -159,10 +412,10 @@ static struct rpc_procinfo mnt_procedures[] = {
159	static struct rpc_procinfo mnt3_procedures[] = {	412	static struct rpc_procinfo mnt3_procedures[] = {
160	[MOUNTPROC3_MNT] = {	413	[MOUNTPROC3_MNT] = {
161	.p_proc = MOUNTPROC3_MNT,	414	.p_proc = MOUNTPROC3_MNT,
162	.p_encode = (kxdrproc_t) xdr_encode_dirpath,	415	.p_encode = (kxdrproc_t)mnt_enc_dirpath,
163	.p_decode = (kxdrproc_t) xdr_decode_fhstatus3,	416	.p_decode = (kxdrproc_t)mnt_dec_mountres3,
164	.p_arglen = MNT_dirpath_sz,	417	.p_arglen = MNT_enc_dirpath_sz,
165	.p_replen = MNT_fhstatus3_sz,	418	.p_replen = MNT_dec_mountres3_sz,
166	.p_statidx = MOUNTPROC3_MNT,	419	.p_statidx = MOUNTPROC3_MNT,
167	.p_name = "MOUNT",	420	.p_name = "MOUNT",
168	},	421	},