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

[deliverable/linux.git] / net / rxrpc / af_rxrpc.c

diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 25d60ed15284a56b1a2f6b9bc8c680f0c9f567c0..1f8a144a5dc2c7b15a2f7f9724758b38ab4146d9 100644 (file)
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -305,7 +305,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock,
 
        if (!key)
                key = rx->key;
-       if (key && !key->payload.data)
+       if (key && !key->payload.data[0])
                key = NULL; /* a no-security key */
 
        bundle = rxrpc_get_bundle(rx, trans, key, service_id, gfp);