Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 166b88d7 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: Use correct XDR encoding procedure for rpcbind SET/UNSET 



The rpcbind versions 3 and 4 SET and UNSET procedures use the same
arguments as the GETADDR procedure.

While definitely a bug, this hasn't been a problem so far since the
kernel hasn't used version 3 or 4 SET and UNSET.  But this will change
in just a moment.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 381ba74a

net/sunrpc/rpcb_clnt.c

+8 −4
Original line number Diff line number Diff line
@@ -426,6 +426,10 @@ static void rpcb_getport_done(struct rpc_task *child, void *data) 
	map->r_status = status;

}



/*

 * XDR functions for rpcbind

 */



static int rpcb_encode_mapping(struct rpc_rqst *req, __be32 *p,

			       struct rpcbind_args *rpcb)

{
@@ -581,14 +585,14 @@ static struct rpc_procinfo rpcb_procedures2[] = { 
};



static struct rpc_procinfo rpcb_procedures3[] = {

	PROC(SET,		mapping,	set),

	PROC(UNSET,		mapping,	set),

	PROC(SET,		getaddr,	set),

	PROC(UNSET,		getaddr,	set),

	PROC(GETADDR,		getaddr,	getaddr),

};



static struct rpc_procinfo rpcb_procedures4[] = {

	PROC(SET,		mapping,	set),

	PROC(UNSET,		mapping,	set),

	PROC(SET,		getaddr,	set),

	PROC(UNSET,		getaddr,	set),

	PROC(GETADDR,		getaddr,	getaddr),

	PROC(GETVERSADDR,	getaddr,	getaddr),

};