rxrpc: Fix security setting propagation

Fix the propagation of the security settings from sendmsg to the rxrpc_call
struct.

Fixes: f3441d4125fc ("rxrpc: Copy client call parameters into rxrpc_call earlier")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c
index be5eb8cdf5497e5620df9ee27f036b5daaa6133f..89dcf60b11587551adac4742f4f399c93d47b165 100644 (file)
--- a/net/rxrpc/call_object.c
+++ b/net/rxrpc/call_object.c
@@ -217,6 +217,7 @@ static struct rxrpc_call *rxrpc_alloc_client_call(struct rxrpc_sock *rx,
        call->tx_total_len      = p->tx_total_len;
        call->key               = key_get(cp->key);
        call->local             = rxrpc_get_local(cp->local, rxrpc_local_get_call);
+       call->security_level    = cp->security_level;
        if (p->kernel)
                __set_bit(RXRPC_CALL_KERNEL, &call->flags);
        if (cp->upgrade)

diff --git a/net/rxrpc/conn_client.c b/net/rxrpc/conn_client.c
index a08e33c9e54b235a09c80639d04c65fbf63734ea..87efa0373aed346b17b801e977516b19eb90ad49 100644 (file)
--- a/net/rxrpc/conn_client.c
+++ b/net/rxrpc/conn_client.c
@@ -551,8 +551,6 @@ static void rxrpc_activate_one_channel(struct rxrpc_connection *conn,
        call->conn      = rxrpc_get_connection(conn, rxrpc_conn_get_activate_call);
        call->cid       = conn->proto.cid | channel;
        call->call_id   = call_id;
-       call->security  = conn->security;
-       call->security_ix = conn->security_ix;
        call->dest_srx.srx_service = conn->service_id;
 
        trace_rxrpc_connect_call(call);

diff --git a/net/rxrpc/security.c b/net/rxrpc/security.c
index 209f2c25a0da9fd48f2d8b5fd279ad0a15cd7ad2..ab968f65a4900d87869c3d755d8806ec3310a4cc 100644 (file)
--- a/net/rxrpc/security.c
+++ b/net/rxrpc/security.c
@@ -67,13 +67,13 @@ const struct rxrpc_security *rxrpc_security_lookup(u8 security_index)
  */
 int rxrpc_init_client_call_security(struct rxrpc_call *call)
 {
-       const struct rxrpc_security *sec;
+       const struct rxrpc_security *sec = &rxrpc_no_security;
        struct rxrpc_key_token *token;
        struct key *key = call->key;
        int ret;
 
        if (!key)
-               return 0;
+               goto found;
 
        ret = key_validate(key);
        if (ret < 0)
@@ -88,7 +88,7 @@ int rxrpc_init_client_call_security(struct rxrpc_call *call)
 
 found:
        call->security = sec;
-       _leave(" = 0");
+       call->security_ix = sec->security_index;
        return 0;
 }