lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/rxrpc trivial annotations

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro
2008-03-29 03:08:38 +00:00
committed by Linus Torvalds
parent 74dbf719ed
commit 91e916cffe
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/rxrpc/ar-internal.h
View File

@@ -23,7 +23,7 @@
struct rxrpc_crypt { struct rxrpc_crypt {
union { union {
u8 x[FCRYPT_BSIZE]; u8 x[FCRYPT_BSIZE];
u32 n[2]; __be32 n[2];
}; };
} __attribute__((aligned(8))); } __attribute__((aligned(8)));

27
net/rxrpc/rxkad.c
View File

@@ -261,6 +261,7 @@ static int rxkad_secure_packet(const struct rxrpc_call *call,
__be32 x[2]; __be32 x[2];
} tmpbuf __attribute__((aligned(8))); /* must all be in same page */ } tmpbuf __attribute__((aligned(8))); /* must all be in same page */
__be32 x; __be32 x;
u32 y;
int ret; int ret;
sp = rxrpc_skb(skb); sp = rxrpc_skb(skb);
@@ -292,11 +293,11 @@ static int rxkad_secure_packet(const struct rxrpc_call *call,
sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf)); sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf)); crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
x = ntohl(tmpbuf.x[1]); y = ntohl(tmpbuf.x[1]);
x = (x >> 16) & 0xffff; y = (y >> 16) & 0xffff;
if (x == 0) if (y == 0)
x = 1; /* zero checksums are not permitted */ y = 1; /* zero checksums are not permitted */
sp->hdr.cksum = htons(x); sp->hdr.cksum = htons(y);
switch (call->conn->security_level) { switch (call->conn->security_level) {
case RXRPC_SECURITY_PLAIN: case RXRPC_SECURITY_PLAIN:
@@ -314,7 +315,7 @@ static int rxkad_secure_packet(const struct rxrpc_call *call,
break; break;
} }
_leave(" = %d [set %hx]", ret, x); _leave(" = %d [set %hx]", ret, y);
return ret; return ret;
} }
@@ -492,6 +493,7 @@ static int rxkad_verify_packet(const struct rxrpc_call *call,
__be32 x[2]; __be32 x[2];
} tmpbuf __attribute__((aligned(8))); /* must all be in same page */ } tmpbuf __attribute__((aligned(8))); /* must all be in same page */
__be32 x; __be32 x;
u16 y;
__be16 cksum; __be16 cksum;
int ret; int ret;
@@ -526,12 +528,12 @@ static int rxkad_verify_packet(const struct rxrpc_call *call,
sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf)); sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf)); crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
x = ntohl(tmpbuf.x[1]); y = ntohl(tmpbuf.x[1]);
x = (x >> 16) & 0xffff; y = (y >> 16) & 0xffff;
if (x == 0) if (y == 0)
x = 1; /* zero checksums are not permitted */ y = 1; /* zero checksums are not permitted */
cksum = htons(x); cksum = htons(y);
if (sp->hdr.cksum != cksum) { if (sp->hdr.cksum != cksum) {
*_abort_code = RXKADSEALEDINCON; *_abort_code = RXKADSEALEDINCON;
_leave(" = -EPROTO [csum failed]"); _leave(" = -EPROTO [csum failed]");
@@ -1001,7 +1003,8 @@ static int rxkad_verify_response(struct rxrpc_connection *conn,
struct rxrpc_crypt session_key; struct rxrpc_crypt session_key;
time_t expiry; time_t expiry;
void *ticket; void *ticket;
u32 abort_code, version, kvno, ticket_len, csum, level; u32 abort_code, version, kvno, ticket_len, level;
__be32 csum;
int ret; int ret;
_enter("{%d,%x}", conn->debug_id, key_serial(conn->server_key)); _enter("{%d,%x}", conn->debug_id, key_serial(conn->server_key));