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

Commit 15b0a8d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-4.13-1' of git://linux-nfs.org/~bfields/linux 

Pull nfsd fix from Bruce Fields:
 "One fix for a problem introduced in the most recent merge window and
  found by Dave Jones and KASAN"

* tag 'nfsd-4.13-1' of git://linux-nfs.org/~bfields/linux:
  nfsd: Fix a memory scribble in the callback channel
parents cb8c65cc eff79368

fs/nfsd/nfs4callback.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -720,8 +720,8 @@ static const struct rpc_version nfs_cb_version4 = { 
	.counts			= nfs4_cb_counts,

	.counts			= nfs4_cb_counts,

};

};





static const struct rpc_version *nfs_cb_version[] = {

static const struct rpc_version *nfs_cb_version[2] = {

	&nfs_cb_version4,

	[1] = &nfs_cb_version4,

};

};





static const struct rpc_program cb_program;

static const struct rpc_program cb_program;
@@ -795,7 +795,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c 
		.saddress	= (struct sockaddr *) &conn->cb_saddr,

		.saddress	= (struct sockaddr *) &conn->cb_saddr,

		.timeout	= &timeparms,

		.timeout	= &timeparms,

		.program	= &cb_program,

		.program	= &cb_program,

		.version	= 0,

		.version	= 1,

		.flags		= (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET),

		.flags		= (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET),

	};

	};

	struct rpc_clnt *client;

	struct rpc_clnt *client;