KEYS: Merge the type-specific data with the payload data

[firefly-linux-kernel-4.4.55.git] / net / rxrpc / ar-security.c

diff --git a/net/rxrpc/ar-security.c b/net/rxrpc/ar-security.c
index 49b3cc31ee1f505b65bf21f6042e6727e2d2ed93..8334474eb26c773664ae56bc8c064e9aa9249b45 100644 (file)
--- a/net/rxrpc/ar-security.c
+++ b/net/rxrpc/ar-security.c
@@ -137,9 +137,9 @@ int rxrpc_init_client_conn_security(struct rxrpc_connection *conn)
        if (ret < 0)
                return ret;
 
-       if (!key->payload.data)
+       token = key->payload.data[0];
+       if (!token)
                return -EKEYREJECTED;
-       token = key->payload.data;
 
        sec = rxrpc_security_lookup(token->security_index);
        if (!sec)