diff options
| author | David Howells <dhowells@redhat.com> | 2015-10-21 14:04:48 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2015-10-21 15:18:36 +0100 |
| commit | 146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc (patch) | |
| tree | a89ef2cd2e8029b0c09a58739cca0e7e2e68f4db /net/rxrpc/af_rxrpc.c | |
| parent | 4adc605edc5f744dcf432241b5996ff6a13d868c (diff) | |
| download | linux-stable-146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc.tar.gz linux-stable-146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc.tar.bz2 linux-stable-146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc.zip | |
KEYS: Merge the type-specific data with the payload data
Merge the type-specific data with the payload data into one four-word chunk
as it seems pointless to keep them separate.
Use user_key_payload() for accessing the payloads of overloaded
user-defined keys.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: linux-cifs@vger.kernel.org
cc: ecryptfs@vger.kernel.org
cc: linux-ext4@vger.kernel.org
cc: linux-f2fs-devel@lists.sourceforge.net
cc: linux-nfs@vger.kernel.org
cc: ceph-devel@vger.kernel.org
cc: linux-ima-devel@lists.sourceforge.net
Diffstat (limited to 'net/rxrpc/af_rxrpc.c')
| -rw-r--r-- | net/rxrpc/af_rxrpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c index 25d60ed15284..1f8a144a5dc2 100644 --- 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); |