Two more NFS client bugfixes for 4.13
Stable fix: - Fix EXCHANGE_ID corrupt verifier issue Other fix: - Fix double frees in nfs4_test_session_trunk() -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEnZ5MQTpR7cLU7KEp18tUv7ClQOsFAlmCNJAACgkQ18tUv7Cl QOvlKhAAjjKMtdwYDV7B3SJvDfa5KNH9nNaMjKoD/OzWavDL7jRVRUWayeJiy4sf wJAMsG280ztag1Mr/OnClESZThWNrHTnKjq/P8kuefJz+pPvWP+AaQ/8QSM/rulM Y7qfh+FZb2t7lK80VAZTXEi4bvQzlkIV2285a34VIUm3VTpwl3HvltkBMLFztDSb sdaQh+N48FOYdG9RMncxpzFfRvUILzP9GFMg6WAFAcbr1wSsT9MfLqd+ANgOidE8 X2Ch9l0jN51m1dFGmMUZ5HMmuhUh2m50SXhmUOTpS7fj+k11OWsV2IIWHKPk/LjI 5E0aUPDU2TOE9noLSfkguAyxvqAGeAHPDIE7QM9vTGgktzXWGzh++ODeSzkIDp+5 iZ+cYLkme1lOg1nEqj1/SrIZXHP7ZCvK8iqNgoqT8rIp6zE1tLPnNAbRDmnwC/VH PrfINATV8llN/3vFojWJfD1enDe3+dALPINLVQOjwjafq6d5/hzRdCGqWpCDjmlU esDoCkoWGUjadIr6EZGtDAzSZgafsUx6d6QnGtkIUsz1d0FIXH6holB5EKaQpOLf dVb9iO5R2EcVP+WvB3KjA5y6MCNvoVqebxMvLBPCYsu3fI8fQ0sgSjgSJXi0fRzg G7DUsKcBGVKarDMXTUReL2G6lN7h0f5EsM1WnA9KF0TV9aah/ZE= =Ddq9 -----END PGP SIGNATURE----- Merge tag 'nfs-for-4.13-4' of git://git.linux-nfs.org/projects/anna/linux-nfs Pull NFS client fixes from Anna Schumaker: "Two fixes from Trond this time, now that he's back from his vacation. The first is a stable fix for the EXCHANGE_ID issue on the mailing list, and the other fixes a double-free situation that he found at the same time. Stable fix: - Fix EXCHANGE_ID corrupt verifier issue Other fix: - Fix double frees in nfs4_test_session_trunk()" * tag 'nfs-for-4.13-4' of git://git.linux-nfs.org/projects/anna/linux-nfs: NFSv4: Fix double frees in nfs4_test_session_trunk() NFSv4: Fix EXCHANGE_ID corrupt verifier issue
This commit is contained in:
commit
19ec50a438
|
@ -660,9 +660,6 @@ int nfs4_detect_session_trunking(struct nfs_client *clp,
|
||||||
if (!nfs4_check_server_scope(clp->cl_serverscope, res->server_scope))
|
if (!nfs4_check_server_scope(clp->cl_serverscope, res->server_scope))
|
||||||
goto out_err;
|
goto out_err;
|
||||||
|
|
||||||
/* Session trunking passed, add the xprt */
|
|
||||||
rpc_clnt_xprt_switch_add_xprt(clp->cl_rpcclient, xprt);
|
|
||||||
|
|
||||||
pr_info("NFS: %s: Session trunking succeeded for %s\n",
|
pr_info("NFS: %s: Session trunking succeeded for %s\n",
|
||||||
clp->cl_hostname,
|
clp->cl_hostname,
|
||||||
xprt->address_strings[RPC_DISPLAY_ADDR]);
|
xprt->address_strings[RPC_DISPLAY_ADDR]);
|
||||||
|
|
|
@ -7461,7 +7461,7 @@ static void nfs4_exchange_id_done(struct rpc_task *task, void *data)
|
||||||
cdata->res.server_scope = NULL;
|
cdata->res.server_scope = NULL;
|
||||||
}
|
}
|
||||||
/* Save the EXCHANGE_ID verifier session trunk tests */
|
/* Save the EXCHANGE_ID verifier session trunk tests */
|
||||||
memcpy(clp->cl_confirm.data, cdata->args.verifier->data,
|
memcpy(clp->cl_confirm.data, cdata->args.verifier.data,
|
||||||
sizeof(clp->cl_confirm.data));
|
sizeof(clp->cl_confirm.data));
|
||||||
}
|
}
|
||||||
out:
|
out:
|
||||||
|
@ -7474,10 +7474,6 @@ static void nfs4_exchange_id_release(void *data)
|
||||||
struct nfs41_exchange_id_data *cdata =
|
struct nfs41_exchange_id_data *cdata =
|
||||||
(struct nfs41_exchange_id_data *)data;
|
(struct nfs41_exchange_id_data *)data;
|
||||||
|
|
||||||
if (cdata->xprt) {
|
|
||||||
xprt_put(cdata->xprt);
|
|
||||||
rpc_clnt_xprt_switch_put(cdata->args.client->cl_rpcclient);
|
|
||||||
}
|
|
||||||
nfs_put_client(cdata->args.client);
|
nfs_put_client(cdata->args.client);
|
||||||
kfree(cdata->res.impl_id);
|
kfree(cdata->res.impl_id);
|
||||||
kfree(cdata->res.server_scope);
|
kfree(cdata->res.server_scope);
|
||||||
|
@ -7498,7 +7494,6 @@ static const struct rpc_call_ops nfs4_exchange_id_call_ops = {
|
||||||
static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
|
static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
|
||||||
u32 sp4_how, struct rpc_xprt *xprt)
|
u32 sp4_how, struct rpc_xprt *xprt)
|
||||||
{
|
{
|
||||||
nfs4_verifier verifier;
|
|
||||||
struct rpc_message msg = {
|
struct rpc_message msg = {
|
||||||
.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_EXCHANGE_ID],
|
.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_EXCHANGE_ID],
|
||||||
.rpc_cred = cred,
|
.rpc_cred = cred,
|
||||||
|
@ -7507,7 +7502,7 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
|
||||||
.rpc_client = clp->cl_rpcclient,
|
.rpc_client = clp->cl_rpcclient,
|
||||||
.callback_ops = &nfs4_exchange_id_call_ops,
|
.callback_ops = &nfs4_exchange_id_call_ops,
|
||||||
.rpc_message = &msg,
|
.rpc_message = &msg,
|
||||||
.flags = RPC_TASK_ASYNC | RPC_TASK_TIMEOUT,
|
.flags = RPC_TASK_TIMEOUT,
|
||||||
};
|
};
|
||||||
struct nfs41_exchange_id_data *calldata;
|
struct nfs41_exchange_id_data *calldata;
|
||||||
struct rpc_task *task;
|
struct rpc_task *task;
|
||||||
|
@ -7522,8 +7517,7 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!xprt)
|
nfs4_init_boot_verifier(clp, &calldata->args.verifier);
|
||||||
nfs4_init_boot_verifier(clp, &verifier);
|
|
||||||
|
|
||||||
status = nfs4_init_uniform_client_string(clp);
|
status = nfs4_init_uniform_client_string(clp);
|
||||||
if (status)
|
if (status)
|
||||||
|
@ -7562,11 +7556,9 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
|
||||||
if (xprt) {
|
if (xprt) {
|
||||||
calldata->xprt = xprt;
|
calldata->xprt = xprt;
|
||||||
task_setup_data.rpc_xprt = xprt;
|
task_setup_data.rpc_xprt = xprt;
|
||||||
task_setup_data.flags =
|
task_setup_data.flags |= RPC_TASK_SOFTCONN;
|
||||||
RPC_TASK_SOFT|RPC_TASK_SOFTCONN|RPC_TASK_ASYNC;
|
memcpy(calldata->args.verifier.data, clp->cl_confirm.data,
|
||||||
calldata->args.verifier = &clp->cl_confirm;
|
sizeof(calldata->args.verifier.data));
|
||||||
} else {
|
|
||||||
calldata->args.verifier = &verifier;
|
|
||||||
}
|
}
|
||||||
calldata->args.client = clp;
|
calldata->args.client = clp;
|
||||||
#ifdef CONFIG_NFS_V4_1_MIGRATION
|
#ifdef CONFIG_NFS_V4_1_MIGRATION
|
||||||
|
@ -7585,11 +7577,6 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
|
||||||
if (IS_ERR(task))
|
if (IS_ERR(task))
|
||||||
return PTR_ERR(task);
|
return PTR_ERR(task);
|
||||||
|
|
||||||
if (!xprt) {
|
|
||||||
status = rpc_wait_for_completion_task(task);
|
|
||||||
if (!status)
|
|
||||||
status = calldata->rpc_status;
|
|
||||||
} else /* session trunking test */
|
|
||||||
status = calldata->rpc_status;
|
status = calldata->rpc_status;
|
||||||
|
|
||||||
rpc_put_task(task);
|
rpc_put_task(task);
|
||||||
|
|
|
@ -1785,7 +1785,7 @@ static void encode_exchange_id(struct xdr_stream *xdr,
|
||||||
int len = 0;
|
int len = 0;
|
||||||
|
|
||||||
encode_op_hdr(xdr, OP_EXCHANGE_ID, decode_exchange_id_maxsz, hdr);
|
encode_op_hdr(xdr, OP_EXCHANGE_ID, decode_exchange_id_maxsz, hdr);
|
||||||
encode_nfs4_verifier(xdr, args->verifier);
|
encode_nfs4_verifier(xdr, &args->verifier);
|
||||||
|
|
||||||
encode_string(xdr, strlen(args->client->cl_owner_id),
|
encode_string(xdr, strlen(args->client->cl_owner_id),
|
||||||
args->client->cl_owner_id);
|
args->client->cl_owner_id);
|
||||||
|
|
|
@ -1235,7 +1235,7 @@ struct nfs41_state_protection {
|
||||||
|
|
||||||
struct nfs41_exchange_id_args {
|
struct nfs41_exchange_id_args {
|
||||||
struct nfs_client *client;
|
struct nfs_client *client;
|
||||||
nfs4_verifier *verifier;
|
nfs4_verifier verifier;
|
||||||
u32 flags;
|
u32 flags;
|
||||||
struct nfs41_state_protection state_protect;
|
struct nfs41_state_protection state_protect;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue