Commit bfab7acc authored by Trond Myklebust's avatar Trond Myklebust Committed by Wang Hai
Browse files

SUNRPC: Ensure that the gssproxy client can start in a connected state 

mainline inclusion
from mainline-v5.18-rc7
commit fd13359f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I59RN0

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fd13359f54ee854f00134abc6be32da94ec53dbf



--------------------------------

Ensure that the gssproxy client connects to the server from the gssproxy
daemon process context so that the AF_LOCAL socket connection is done
using the correct path and namespaces.

Fixes: 1d658336 ("SUNRPC: Add RPC based upcall mechanism for RPCGSS auth")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>

conflict:
	net/sunrpc/clnt.c

Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
parent 32613ac5

include/linux/sunrpc/clnt.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ struct rpc_add_xprt_test { 
#define RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT	(1UL << 9)

#define RPC_CLNT_CREATE_SOFTERR		(1UL << 10)

#define RPC_CLNT_CREATE_REUSEPORT	(1UL << 11)

#define RPC_CLNT_CREATE_CONNECTED	(1UL << 12)



struct rpc_clnt *rpc_create(struct rpc_create_args *args);

struct rpc_clnt	*rpc_bind_new_program(struct rpc_clnt *,

net/sunrpc/auth_gss/gss_rpc_upcall.c

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ static int gssp_rpc_create(struct net *net, struct rpc_clnt **_clnt) 
		 * done without the correct namespace:

		 */

		.flags		= RPC_CLNT_CREATE_NOPING |

				  RPC_CLNT_CREATE_CONNECTED |

				  RPC_CLNT_CREATE_NO_IDLE_TIMEOUT

	};

	struct rpc_clnt *clnt;

net/sunrpc/clnt.c

+33 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ static int rpc_encode_header(struct rpc_task *task, 
static int	rpc_decode_header(struct rpc_task *task,

				  struct xdr_stream *xdr);

static int	rpc_ping(struct rpc_clnt *clnt);

static int	rpc_ping_noreply(struct rpc_clnt *clnt);

static void	rpc_check_timeout(struct rpc_task *task);



static void rpc_register_client(struct rpc_clnt *clnt)
@@ -479,6 +480,12 @@ static struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args, 
			rpc_shutdown_client(clnt);

			return ERR_PTR(err);

		}

	} else if (args->flags & RPC_CLNT_CREATE_CONNECTED) {

		int err = rpc_ping_noreply(clnt);

		if (err != 0) {

			rpc_shutdown_client(clnt);

			return ERR_PTR(err);

		}

	}



	clnt->cl_softrtry = 1;
@@ -2674,6 +2681,10 @@ static const struct rpc_procinfo rpcproc_null = { 
	.p_decode = rpcproc_decode_null,

};



static const struct rpc_procinfo rpcproc_null_noreply = {

	.p_encode = rpcproc_encode_null,

};



static int rpc_ping(struct rpc_clnt *clnt)

{

	struct rpc_message msg = {
@@ -2685,6 +2696,28 @@ static int rpc_ping(struct rpc_clnt *clnt) 
	return err;

}



static int rpc_ping_noreply(struct rpc_clnt *clnt)

{

	struct rpc_message msg = {

		.rpc_proc = &rpcproc_null_noreply,

	};

	struct rpc_task_setup task_setup_data = {

		.rpc_client = clnt,

		.rpc_message = &msg,

		.callback_ops = &rpc_default_ops,

		.flags = RPC_TASK_SOFT | RPC_TASK_SOFTCONN | RPC_TASK_NULLCREDS,

	};

	struct rpc_task	*task;

	int status;



	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task))

		return PTR_ERR(task);

	status = task->tk_status;

	rpc_put_task(task);

	return status;

}



static

struct rpc_task *rpc_call_null_helper(struct rpc_clnt *clnt,

		struct rpc_xprt *xprt, struct rpc_cred *cred, int flags,