Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
net
/
rxrpc
/
rxkad.c
diff --git
a/kernel/net/rxrpc/rxkad.c
b/kernel/net/rxrpc/rxkad.c
index
f226709
..
d7a9ab5
100644
(file)
--- a/
kernel/net/rxrpc/rxkad.c
+++ b/
kernel/net/rxrpc/rxkad.c
@@
-67,7
+67,7
@@
static int rxkad_init_connection_security(struct rxrpc_connection *conn)
_enter("{%d},{%x}", conn->debug_id, key_serial(conn->key));
_enter("{%d},{%x}", conn->debug_id, key_serial(conn->key));
- token = conn->key->payload.data;
+ token = conn->key->payload.data
[0]
;
conn->security_ix = token->security_index;
ci = crypto_alloc_blkcipher("pcbc(fcrypt)", 0, CRYPTO_ALG_ASYNC);
conn->security_ix = token->security_index;
ci = crypto_alloc_blkcipher("pcbc(fcrypt)", 0, CRYPTO_ALG_ASYNC);
@@
-125,7
+125,7
@@
static void rxkad_prime_packet_security(struct rxrpc_connection *conn)
if (!conn->key)
return;
if (!conn->key)
return;
- token = conn->key->payload.data;
+ token = conn->key->payload.data
[0]
;
memcpy(&iv, token->kad->session_key, sizeof(iv));
desc.tfm = conn->cipher;
memcpy(&iv, token->kad->session_key, sizeof(iv));
desc.tfm = conn->cipher;
@@
-221,7
+221,7
@@
static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call,
rxkhdr.checksum = 0;
/* encrypt from the session key */
rxkhdr.checksum = 0;
/* encrypt from the session key */
- token = call->conn->key->payload.data;
+ token = call->conn->key->payload.data
[0]
;
memcpy(&iv, token->kad->session_key, sizeof(iv));
desc.tfm = call->conn->cipher;
desc.info = iv.x;
memcpy(&iv, token->kad->session_key, sizeof(iv));
desc.tfm = call->conn->cipher;
desc.info = iv.x;
@@
-433,7
+433,7
@@
static int rxkad_verify_packet_encrypt(const struct rxrpc_call *call,
skb_to_sgvec(skb, sg, 0, skb->len);
/* decrypt from the session key */
skb_to_sgvec(skb, sg, 0, skb->len);
/* decrypt from the session key */
- token = call->conn->key->payload.data;
+ token = call->conn->key->payload.data
[0]
;
memcpy(&iv, token->kad->session_key, sizeof(iv));
desc.tfm = call->conn->cipher;
desc.info = iv.x;
memcpy(&iv, token->kad->session_key, sizeof(iv));
desc.tfm = call->conn->cipher;
desc.info = iv.x;
@@
-780,7
+780,7
@@
static int rxkad_respond_to_challenge(struct rxrpc_connection *conn,
if (conn->security_level < min_level)
goto protocol_error;
if (conn->security_level < min_level)
goto protocol_error;
- token = conn->key->payload.data;
+ token = conn->key->payload.data
[0]
;
/* build the response packet */
memset(&resp, 0, sizeof(resp));
/* build the response packet */
memset(&resp, 0, sizeof(resp));
@@
-848,12
+848,12
@@
static int rxkad_decrypt_ticket(struct rxrpc_connection *conn,
}
}
}
}
- ASSERT(conn->server_key->payload.data != NULL);
+ ASSERT(conn->server_key->payload.data
[0]
!= NULL);
ASSERTCMP((unsigned long) ticket & 7UL, ==, 0);
ASSERTCMP((unsigned long) ticket & 7UL, ==, 0);
- memcpy(&iv, &conn->server_key->
type_data
, sizeof(iv));
+ memcpy(&iv, &conn->server_key->
payload.data[2]
, sizeof(iv));
- desc.tfm = conn->server_key->payload.data;
+ desc.tfm = conn->server_key->payload.data
[0]
;
desc.info = iv.x;
desc.flags = 0;
desc.info = iv.x;
desc.flags = 0;