mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
One fix for a problem introduced in the most recent merge window and
found by Dave Jones and KASAN. -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJZbhjwAAoJECebzXlCjuG+kx4P/3iBtL7+dBIcz3Lj6oetbOM0 6myybTmC6ZWLN9cmNN6GIFk82TUYvo4EQRAOt7GcSdF6X5GtMM0LNMMaquAxM/gc ZwCeQ0K33PKL3qIlaOF1DYT/DN3uwVdRl+VfueMzQjOAfm7kMtQaa1xjaGJtqT13 Vssn5S4LWIo9SaXFp9/kgnPZF9kIl1v8Rfwowhn8g90KNChcKnMSi4ia0jrMPK/w VLuOr8VLPlUa3GEKmcwMQqf+0WPryvVtahHIblNVTHyFeYP/j5u7TCp3T5GoechR /Rk2MPzPMtNk850QkrwEegYuJIRsMvrhSMaV/FOZCNKi728haP9ruOSQryMRKUBt BJMJrE+0hclJ2KPPbjp1cp2P1fn+dZbt+V22VGRD1ZTgKQKj7+DgSfLxUgA6/X4L 4QjfmO5N6suLfl8XaXyncliQxFoyWWV4s+FKQDjk5/dZ0/PZt1zBZ3cBo2Bxnjgj 1yfeVM8zyrnIAJv04U59fQnXaaqgkk0NmOllpTN4exbyHqq7U4wz9gpjFulbBn5X p6ebs6RKdRolfalpTyaRvdDcg8zmSwyeoHpzc3FHr7AGhX0edOXR8b+vWhalFB7T B1Jnoy/qesGjafB7BXgLtaZQO6wMoQv3JdTDrxDlRIXJQfULeR0Zw5kosNzgaBKY B1TSX5Tiit9W7+DxAfz+ =QSoH -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
15b0a8d1d4
1 changed files with 3 additions and 3 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue