diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2020-01-17 08:59:29 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2020-01-17 08:59:29 +0100 |
| commit | 6a77de2596a8d02cbfe9cebe448d8575e4354c9a (patch) | |
| tree | 13e7621c147ef1415195213089ce3c2c94590bde /net/rxrpc/conn_service.c | |
| parent | 59c324683400b41caa6d85b091e812ee3d5415c3 (diff) | |
| parent | b3a987b0264d3ddbb24293ebff10eddfc472f653 (diff) | |
| download | linux-6a77de2596a8d02cbfe9cebe448d8575e4354c9a.tar.bz2 | |
Merge tag 'v5.5-rc6' into devel
Linux 5.5-rc6
Diffstat (limited to 'net/rxrpc/conn_service.c')
| -rw-r--r-- | net/rxrpc/conn_service.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/rxrpc/conn_service.c b/net/rxrpc/conn_service.c index 123d6ceab15c..21da48e3d2e5 100644 --- a/net/rxrpc/conn_service.c +++ b/net/rxrpc/conn_service.c @@ -148,6 +148,8 @@ struct rxrpc_connection *rxrpc_prealloc_service_connection(struct rxrpc_net *rxn */ void rxrpc_new_incoming_connection(struct rxrpc_sock *rx, struct rxrpc_connection *conn, + const struct rxrpc_security *sec, + struct key *key, struct sk_buff *skb) { struct rxrpc_skb_priv *sp = rxrpc_skb(skb); @@ -160,6 +162,8 @@ void rxrpc_new_incoming_connection(struct rxrpc_sock *rx, conn->service_id = sp->hdr.serviceId; conn->security_ix = sp->hdr.securityIndex; conn->out_clientflag = 0; + conn->security = sec; + conn->server_key = key_get(key); if (conn->security_ix) conn->state = RXRPC_CONN_SERVICE_UNSECURED; else |