From: David Howells <dhowells@redhat.com>
To: linux-afs@lists.infradead.org
Cc: dhowells@redhat.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 10/13] rxrpc: rxkad: The version number in the response should be net byte order
Date: Fri, 04 Mar 2016 16:38:15 +0000 [thread overview]
Message-ID: <20160304163815.31057.23078.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20160304163705.31057.60831.stgit@warthog.procyon.org.uk>
The version number rxkad places in the response should be network byte
order.
Whilst we're at it, rearrange the code to be more readable.
Signed-off-by: David Howells <dhowells@redhat.com>
---
net/rxrpc/rxkad.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index 0f27524536bd..ca746f382517 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -787,10 +787,15 @@ static int rxkad_respond_to_challenge(struct rxrpc_connection *conn,
/* build the response packet */
memset(&resp, 0, sizeof(resp));
- resp.version = RXKAD_VERSION;
- resp.encrypted.epoch = htonl(conn->epoch);
- resp.encrypted.cid = htonl(conn->cid);
- resp.encrypted.securityIndex = htonl(conn->security_ix);
+ resp.version = htonl(RXKAD_VERSION);
+ resp.encrypted.epoch = htonl(conn->epoch);
+ resp.encrypted.cid = htonl(conn->cid);
+ resp.encrypted.securityIndex = htonl(conn->security_ix);
+ resp.encrypted.inc_nonce = htonl(nonce + 1);
+ resp.encrypted.level = htonl(conn->security_level);
+ resp.kvno = htonl(token->kad->kvno);
+ resp.ticket_len = htonl(token->kad->ticket_len);
+
resp.encrypted.call_id[0] =
htonl(conn->channels[0] ? conn->channels[0]->call_id : 0);
resp.encrypted.call_id[1] =
@@ -799,10 +804,6 @@ static int rxkad_respond_to_challenge(struct rxrpc_connection *conn,
htonl(conn->channels[2] ? conn->channels[2]->call_id : 0);
resp.encrypted.call_id[3] =
htonl(conn->channels[3] ? conn->channels[3]->call_id : 0);
- resp.encrypted.inc_nonce = htonl(nonce + 1);
- resp.encrypted.level = htonl(conn->security_level);
- resp.kvno = htonl(token->kad->kvno);
- resp.ticket_len = htonl(token->kad->ticket_len);
/* calculate the response checksum and then do the encryption */
rxkad_calc_response_checksum(&resp);
next prev parent reply other threads:[~2016-03-04 16:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-04 16:37 [PATCH 00/13] RxRPC: Rewrite part 1 David Howells
2016-03-04 16:37 ` [PATCH 01/13] rxrpc: Fix a case where a call event bit is being used as a flag bit David Howells
2016-03-04 16:37 ` [PATCH 02/13] rxrpc: Convert call flag and event numbers into enums David Howells
2016-03-04 16:37 ` [PATCH 03/13] rxrpc: Rename call events to begin RXRPC_CALL_EV_ David Howells
2016-03-04 16:37 ` [PATCH 04/13] rxrpc: Keep the skb private record of the Rx header in host byte order David Howells
2016-03-04 16:37 ` [PATCH 05/13] rxrpc: The protocol family should be set to PF_RXRPC not PF_UNIX David Howells
2016-03-04 16:37 ` [PATCH 06/13] rxrpc: Fix defined range for /proc/sys/net/rxrpc/rx_mtu David Howells
2016-03-04 16:37 ` [PATCH 07/13] rxrpc: Be more selective about the types of received packets we accept David Howells
2016-03-04 16:38 ` [PATCH 08/13] rxrpc: Adjust some whitespace and comments David Howells
2016-03-04 16:38 ` [PATCH 09/13] rxrpc: Use ACCESS_ONCE() when accessing circular buffer pointers David Howells
2016-03-04 16:38 ` David Howells [this message]
2016-03-04 16:38 ` [PATCH 11/13] rxrpc: rxkad: Casts are needed when comparing be32 values David Howells
2016-03-04 16:38 ` [PATCH 12/13] rxrpc: Clear the unused part of a sockaddr_rxrpc for memcmp() use David Howells
2016-03-04 16:38 ` [PATCH 13/13] rxrpc: Don't try to map ICMP to error as the lower layer already did that David Howells
2016-03-04 22:20 ` [PATCH 00/13] RxRPC: Rewrite part 1 David Miller
2016-03-04 22:33 ` David Howells
2016-03-04 23:27 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160304163815.31057.23078.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=linux-afs@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox