2007-04-27 06:48:28 +08:00
|
|
|
/* Kerberos-based RxRPC security
|
|
|
|
*
|
|
|
|
* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
|
|
|
|
* Written by David Howells (dhowells@redhat.com)
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
2016-06-03 03:08:52 +08:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2016-01-24 21:19:01 +08:00
|
|
|
#include <crypto/skcipher.h>
|
2007-04-27 06:48:28 +08:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/net.h>
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/udp.h>
|
|
|
|
#include <linux/scatterlist.h>
|
|
|
|
#include <linux/ctype.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2007-04-27 06:48:28 +08:00
|
|
|
#include <net/sock.h>
|
|
|
|
#include <net/af_rxrpc.h>
|
2009-09-14 09:17:35 +08:00
|
|
|
#include <keys/rxrpc-type.h>
|
2007-04-27 06:48:28 +08:00
|
|
|
#include "ar-internal.h"
|
|
|
|
|
|
|
|
#define RXKAD_VERSION 2
|
|
|
|
#define MAXKRB5TICKETLEN 1024
|
|
|
|
#define RXKAD_TKT_TYPE_KERBEROS_V5 256
|
|
|
|
#define ANAME_SZ 40 /* size of authentication name */
|
|
|
|
#define INST_SZ 40 /* size of principal's instance */
|
|
|
|
#define REALM_SZ 40 /* size of principal's auth domain */
|
|
|
|
#define SNAME_SZ 40 /* size of service name */
|
|
|
|
|
|
|
|
struct rxkad_level1_hdr {
|
|
|
|
__be32 data_size; /* true data size (excluding padding) */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct rxkad_level2_hdr {
|
|
|
|
__be32 data_size; /* true data size (excluding padding) */
|
|
|
|
__be32 checksum; /* decrypted data checksum */
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* this holds a pinned cipher so that keventd doesn't get called by the cipher
|
|
|
|
* alloc routine, but since we have it to hand, we use it to decrypt RESPONSE
|
|
|
|
* packets
|
|
|
|
*/
|
2016-01-24 21:19:01 +08:00
|
|
|
static struct crypto_skcipher *rxkad_ci;
|
2007-04-27 06:48:28 +08:00
|
|
|
static DEFINE_MUTEX(rxkad_ci_mutex);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* initialise connection security
|
|
|
|
*/
|
|
|
|
static int rxkad_init_connection_security(struct rxrpc_connection *conn)
|
|
|
|
{
|
2016-01-24 21:19:01 +08:00
|
|
|
struct crypto_skcipher *ci;
|
2009-09-14 09:17:35 +08:00
|
|
|
struct rxrpc_key_token *token;
|
2007-04-27 06:48:28 +08:00
|
|
|
int ret;
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
_enter("{%d},{%x}", conn->debug_id, key_serial(conn->params.key));
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
token = conn->params.key->payload.data[0];
|
2009-09-14 09:17:35 +08:00
|
|
|
conn->security_ix = token->security_index;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-01-24 21:19:01 +08:00
|
|
|
ci = crypto_alloc_skcipher("pcbc(fcrypt)", 0, CRYPTO_ALG_ASYNC);
|
2007-04-27 06:48:28 +08:00
|
|
|
if (IS_ERR(ci)) {
|
|
|
|
_debug("no cipher");
|
|
|
|
ret = PTR_ERR(ci);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2016-01-24 21:19:01 +08:00
|
|
|
if (crypto_skcipher_setkey(ci, token->kad->session_key,
|
|
|
|
sizeof(token->kad->session_key)) < 0)
|
2007-04-27 06:48:28 +08:00
|
|
|
BUG();
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
switch (conn->params.security_level) {
|
2007-04-27 06:48:28 +08:00
|
|
|
case RXRPC_SECURITY_PLAIN:
|
|
|
|
break;
|
|
|
|
case RXRPC_SECURITY_AUTH:
|
|
|
|
conn->size_align = 8;
|
|
|
|
conn->security_size = sizeof(struct rxkad_level1_hdr);
|
|
|
|
break;
|
|
|
|
case RXRPC_SECURITY_ENCRYPT:
|
|
|
|
conn->size_align = 8;
|
|
|
|
conn->security_size = sizeof(struct rxkad_level2_hdr);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = -EKEYREJECTED;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
conn->cipher = ci;
|
|
|
|
ret = 0;
|
|
|
|
error:
|
|
|
|
_leave(" = %d", ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* prime the encryption state with the invariant parts of a connection's
|
|
|
|
* description
|
|
|
|
*/
|
2016-06-27 05:55:24 +08:00
|
|
|
static int rxkad_prime_packet_security(struct rxrpc_connection *conn)
|
2007-04-27 06:48:28 +08:00
|
|
|
{
|
2009-09-14 09:17:35 +08:00
|
|
|
struct rxrpc_key_token *token;
|
2016-01-24 21:19:01 +08:00
|
|
|
SKCIPHER_REQUEST_ON_STACK(req, conn->cipher);
|
2016-06-27 05:55:24 +08:00
|
|
|
struct scatterlist sg;
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_crypt iv;
|
2016-06-27 05:55:24 +08:00
|
|
|
__be32 *tmpbuf;
|
|
|
|
size_t tmpsize = 4 * sizeof(__be32);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
_enter("");
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
if (!conn->params.key)
|
2016-06-27 05:55:24 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
tmpbuf = kmalloc(tmpsize, GFP_KERNEL);
|
|
|
|
if (!tmpbuf)
|
|
|
|
return -ENOMEM;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
token = conn->params.key->payload.data[0];
|
2009-09-14 09:17:35 +08:00
|
|
|
memcpy(&iv, token->kad->session_key, sizeof(iv));
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-06-27 05:55:24 +08:00
|
|
|
tmpbuf[0] = htonl(conn->proto.epoch);
|
|
|
|
tmpbuf[1] = htonl(conn->proto.cid);
|
|
|
|
tmpbuf[2] = 0;
|
|
|
|
tmpbuf[3] = htonl(conn->security_ix);
|
2016-01-24 21:19:01 +08:00
|
|
|
|
2016-06-27 05:55:24 +08:00
|
|
|
sg_init_one(&sg, tmpbuf, tmpsize);
|
2016-01-24 21:19:01 +08:00
|
|
|
skcipher_request_set_tfm(req, conn->cipher);
|
|
|
|
skcipher_request_set_callback(req, 0, NULL, NULL);
|
2016-06-27 05:55:24 +08:00
|
|
|
skcipher_request_set_crypt(req, &sg, &sg, tmpsize, iv.x);
|
2016-01-24 21:19:01 +08:00
|
|
|
crypto_skcipher_encrypt(req);
|
|
|
|
skcipher_request_zero(req);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-06-27 05:55:24 +08:00
|
|
|
memcpy(&conn->csum_iv, tmpbuf + 2, sizeof(conn->csum_iv));
|
|
|
|
kfree(tmpbuf);
|
|
|
|
_leave(" = 0");
|
|
|
|
return 0;
|
2007-04-27 06:48:28 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* partially encrypt a packet (level 1 security)
|
|
|
|
*/
|
|
|
|
static int rxkad_secure_packet_auth(const struct rxrpc_call *call,
|
|
|
|
struct sk_buff *skb,
|
|
|
|
u32 data_size,
|
|
|
|
void *sechdr)
|
|
|
|
{
|
|
|
|
struct rxrpc_skb_priv *sp;
|
2016-01-24 21:19:01 +08:00
|
|
|
SKCIPHER_REQUEST_ON_STACK(req, call->conn->cipher);
|
2016-06-27 05:55:24 +08:00
|
|
|
struct rxkad_level1_hdr hdr;
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_crypt iv;
|
2016-06-27 05:55:24 +08:00
|
|
|
struct scatterlist sg;
|
2007-04-27 06:48:28 +08:00
|
|
|
u16 check;
|
|
|
|
|
|
|
|
sp = rxrpc_skb(skb);
|
|
|
|
|
|
|
|
_enter("");
|
|
|
|
|
2016-09-22 07:29:31 +08:00
|
|
|
check = sp->hdr.seq ^ call->call_id;
|
2016-03-04 23:53:46 +08:00
|
|
|
data_size |= (u32)check << 16;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-06-27 05:55:24 +08:00
|
|
|
hdr.data_size = htonl(data_size);
|
|
|
|
memcpy(sechdr, &hdr, sizeof(hdr));
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
/* start the encryption afresh */
|
|
|
|
memset(&iv, 0, sizeof(iv));
|
|
|
|
|
2016-06-27 05:55:24 +08:00
|
|
|
sg_init_one(&sg, sechdr, 8);
|
2016-01-24 21:19:01 +08:00
|
|
|
skcipher_request_set_tfm(req, call->conn->cipher);
|
|
|
|
skcipher_request_set_callback(req, 0, NULL, NULL);
|
2016-06-27 05:55:24 +08:00
|
|
|
skcipher_request_set_crypt(req, &sg, &sg, 8, iv.x);
|
2016-01-24 21:19:01 +08:00
|
|
|
crypto_skcipher_encrypt(req);
|
|
|
|
skcipher_request_zero(req);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
_leave(" = 0");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* wholly encrypt a packet (level 2 security)
|
|
|
|
*/
|
|
|
|
static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call,
|
2016-03-04 23:56:19 +08:00
|
|
|
struct sk_buff *skb,
|
|
|
|
u32 data_size,
|
|
|
|
void *sechdr)
|
2007-04-27 06:48:28 +08:00
|
|
|
{
|
2009-09-14 09:17:35 +08:00
|
|
|
const struct rxrpc_key_token *token;
|
2016-06-27 05:55:24 +08:00
|
|
|
struct rxkad_level2_hdr rxkhdr;
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_skb_priv *sp;
|
2016-01-24 21:19:01 +08:00
|
|
|
SKCIPHER_REQUEST_ON_STACK(req, call->conn->cipher);
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_crypt iv;
|
|
|
|
struct scatterlist sg[16];
|
|
|
|
struct sk_buff *trailer;
|
2012-04-15 13:58:06 +08:00
|
|
|
unsigned int len;
|
2007-04-27 06:48:28 +08:00
|
|
|
u16 check;
|
|
|
|
int nsg;
|
2016-01-24 21:19:01 +08:00
|
|
|
int err;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
sp = rxrpc_skb(skb);
|
|
|
|
|
|
|
|
_enter("");
|
|
|
|
|
2016-09-22 07:29:31 +08:00
|
|
|
check = sp->hdr.seq ^ call->call_id;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-03-04 23:53:46 +08:00
|
|
|
rxkhdr.data_size = htonl(data_size | (u32)check << 16);
|
2007-04-27 06:48:28 +08:00
|
|
|
rxkhdr.checksum = 0;
|
2016-06-27 05:55:24 +08:00
|
|
|
memcpy(sechdr, &rxkhdr, sizeof(rxkhdr));
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
/* encrypt from the session key */
|
2016-04-04 21:00:36 +08:00
|
|
|
token = call->conn->params.key->payload.data[0];
|
2009-09-14 09:17:35 +08:00
|
|
|
memcpy(&iv, token->kad->session_key, sizeof(iv));
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2007-10-27 15:52:07 +08:00
|
|
|
sg_init_one(&sg[0], sechdr, sizeof(rxkhdr));
|
2016-01-24 21:19:01 +08:00
|
|
|
skcipher_request_set_tfm(req, call->conn->cipher);
|
|
|
|
skcipher_request_set_callback(req, 0, NULL, NULL);
|
2016-06-27 05:55:24 +08:00
|
|
|
skcipher_request_set_crypt(req, &sg[0], &sg[0], sizeof(rxkhdr), iv.x);
|
2016-01-24 21:19:01 +08:00
|
|
|
crypto_skcipher_encrypt(req);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
/* we want to encrypt the skbuff in-place */
|
|
|
|
nsg = skb_cow_data(skb, 0, &trailer);
|
2016-01-24 21:19:01 +08:00
|
|
|
err = -ENOMEM;
|
2007-04-27 06:48:28 +08:00
|
|
|
if (nsg < 0 || nsg > 16)
|
2016-01-24 21:19:01 +08:00
|
|
|
goto out;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
len = data_size + call->conn->size_align - 1;
|
|
|
|
len &= ~(call->conn->size_align - 1);
|
|
|
|
|
2007-10-31 12:29:29 +08:00
|
|
|
sg_init_table(sg, nsg);
|
|
|
|
skb_to_sgvec(skb, sg, 0, len);
|
2016-01-24 21:19:01 +08:00
|
|
|
skcipher_request_set_crypt(req, sg, sg, len, iv.x);
|
|
|
|
crypto_skcipher_encrypt(req);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
_leave(" = 0");
|
2016-01-24 21:19:01 +08:00
|
|
|
err = 0;
|
|
|
|
|
|
|
|
out:
|
|
|
|
skcipher_request_zero(req);
|
|
|
|
return err;
|
2007-04-27 06:48:28 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* checksum an RxRPC packet header
|
|
|
|
*/
|
2016-06-27 05:55:24 +08:00
|
|
|
static int rxkad_secure_packet(struct rxrpc_call *call,
|
2016-03-04 23:56:19 +08:00
|
|
|
struct sk_buff *skb,
|
|
|
|
size_t data_size,
|
|
|
|
void *sechdr)
|
2007-04-27 06:48:28 +08:00
|
|
|
{
|
|
|
|
struct rxrpc_skb_priv *sp;
|
2016-01-24 21:19:01 +08:00
|
|
|
SKCIPHER_REQUEST_ON_STACK(req, call->conn->cipher);
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_crypt iv;
|
2016-06-27 05:55:24 +08:00
|
|
|
struct scatterlist sg;
|
2016-03-04 23:53:46 +08:00
|
|
|
u32 x, y;
|
2007-04-27 06:48:28 +08:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
sp = rxrpc_skb(skb);
|
|
|
|
|
|
|
|
_enter("{%d{%x}},{#%u},%zu,",
|
2016-04-04 21:00:36 +08:00
|
|
|
call->debug_id, key_serial(call->conn->params.key),
|
|
|
|
sp->hdr.seq, data_size);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
if (!call->conn->cipher)
|
|
|
|
return 0;
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
ret = key_validate(call->conn->params.key);
|
2007-04-27 06:48:28 +08:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
/* continue encrypting from where we left off */
|
|
|
|
memcpy(&iv, call->conn->csum_iv.x, sizeof(iv));
|
|
|
|
|
|
|
|
/* calculate the security checksum */
|
2016-08-23 22:27:24 +08:00
|
|
|
x = (call->cid & RXRPC_CHANNELMASK) << (32 - RXRPC_CIDSHIFT);
|
2016-03-04 23:53:46 +08:00
|
|
|
x |= sp->hdr.seq & 0x3fffffff;
|
2016-09-22 07:29:31 +08:00
|
|
|
call->crypto_buf[0] = htonl(call->call_id);
|
2016-06-27 05:55:24 +08:00
|
|
|
call->crypto_buf[1] = htonl(x);
|
2016-01-24 21:19:01 +08:00
|
|
|
|
2016-06-27 05:55:24 +08:00
|
|
|
sg_init_one(&sg, call->crypto_buf, 8);
|
2016-01-24 21:19:01 +08:00
|
|
|
skcipher_request_set_tfm(req, call->conn->cipher);
|
|
|
|
skcipher_request_set_callback(req, 0, NULL, NULL);
|
2016-06-27 05:55:24 +08:00
|
|
|
skcipher_request_set_crypt(req, &sg, &sg, 8, iv.x);
|
2016-01-24 21:19:01 +08:00
|
|
|
crypto_skcipher_encrypt(req);
|
|
|
|
skcipher_request_zero(req);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-06-27 05:55:24 +08:00
|
|
|
y = ntohl(call->crypto_buf[1]);
|
2008-03-29 11:08:38 +08:00
|
|
|
y = (y >> 16) & 0xffff;
|
|
|
|
if (y == 0)
|
|
|
|
y = 1; /* zero checksums are not permitted */
|
2016-03-04 23:53:46 +08:00
|
|
|
sp->hdr.cksum = y;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
switch (call->conn->params.security_level) {
|
2007-04-27 06:48:28 +08:00
|
|
|
case RXRPC_SECURITY_PLAIN:
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
case RXRPC_SECURITY_AUTH:
|
|
|
|
ret = rxkad_secure_packet_auth(call, skb, data_size, sechdr);
|
|
|
|
break;
|
|
|
|
case RXRPC_SECURITY_ENCRYPT:
|
|
|
|
ret = rxkad_secure_packet_encrypt(call, skb, data_size,
|
|
|
|
sechdr);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = -EPERM;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2008-03-29 11:08:38 +08:00
|
|
|
_leave(" = %d [set %hx]", ret, y);
|
2007-04-27 06:48:28 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* decrypt partial encryption on a packet (level 1 security)
|
|
|
|
*/
|
2016-09-07 05:19:51 +08:00
|
|
|
static int rxkad_verify_packet_1(struct rxrpc_call *call, struct sk_buff *skb,
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
unsigned int offset, unsigned int len,
|
2016-09-07 05:19:51 +08:00
|
|
|
rxrpc_seq_t seq)
|
2007-04-27 06:48:28 +08:00
|
|
|
{
|
|
|
|
struct rxkad_level1_hdr sechdr;
|
2016-01-24 21:19:01 +08:00
|
|
|
SKCIPHER_REQUEST_ON_STACK(req, call->conn->cipher);
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_crypt iv;
|
2007-10-27 15:52:07 +08:00
|
|
|
struct scatterlist sg[16];
|
2007-04-27 06:48:28 +08:00
|
|
|
struct sk_buff *trailer;
|
|
|
|
u32 data_size, buf;
|
|
|
|
u16 check;
|
2007-10-27 15:52:07 +08:00
|
|
|
int nsg;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
_enter("");
|
|
|
|
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
if (len < 8) {
|
2016-09-07 05:19:51 +08:00
|
|
|
rxrpc_abort_call("V1H", call, seq, RXKADSEALEDINCON, EPROTO);
|
|
|
|
goto protocol_error;
|
|
|
|
}
|
2007-04-27 06:48:28 +08:00
|
|
|
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
/* Decrypt the skbuff in-place. TODO: We really want to decrypt
|
|
|
|
* directly into the target buffer.
|
|
|
|
*/
|
2007-10-27 15:52:07 +08:00
|
|
|
nsg = skb_cow_data(skb, 0, &trailer);
|
|
|
|
if (nsg < 0 || nsg > 16)
|
2007-04-27 06:48:28 +08:00
|
|
|
goto nomem;
|
|
|
|
|
2007-10-27 15:52:07 +08:00
|
|
|
sg_init_table(sg, nsg);
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
skb_to_sgvec(skb, sg, offset, 8);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
/* start the decryption afresh */
|
|
|
|
memset(&iv, 0, sizeof(iv));
|
|
|
|
|
2016-01-24 21:19:01 +08:00
|
|
|
skcipher_request_set_tfm(req, call->conn->cipher);
|
|
|
|
skcipher_request_set_callback(req, 0, NULL, NULL);
|
|
|
|
skcipher_request_set_crypt(req, sg, sg, 8, iv.x);
|
|
|
|
crypto_skcipher_decrypt(req);
|
|
|
|
skcipher_request_zero(req);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-09-07 05:19:51 +08:00
|
|
|
/* Extract the decrypted packet length */
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
if (skb_copy_bits(skb, offset, &sechdr, sizeof(sechdr)) < 0) {
|
2016-09-07 05:19:51 +08:00
|
|
|
rxrpc_abort_call("XV1", call, seq, RXKADDATALEN, EPROTO);
|
|
|
|
goto protocol_error;
|
|
|
|
}
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
offset += sizeof(sechdr);
|
|
|
|
len -= sizeof(sechdr);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
buf = ntohl(sechdr.data_size);
|
|
|
|
data_size = buf & 0xffff;
|
|
|
|
|
|
|
|
check = buf >> 16;
|
2016-09-07 05:19:51 +08:00
|
|
|
check ^= seq ^ call->call_id;
|
2007-04-27 06:48:28 +08:00
|
|
|
check &= 0xffff;
|
|
|
|
if (check != 0) {
|
2016-09-07 05:19:51 +08:00
|
|
|
rxrpc_abort_call("V1C", call, seq, RXKADSEALEDINCON, EPROTO);
|
2007-04-27 06:48:28 +08:00
|
|
|
goto protocol_error;
|
|
|
|
}
|
|
|
|
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
if (data_size > len) {
|
2016-09-07 05:19:51 +08:00
|
|
|
rxrpc_abort_call("V1L", call, seq, RXKADDATALEN, EPROTO);
|
|
|
|
goto protocol_error;
|
|
|
|
}
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
_leave(" = 0 [dlen=%x]", data_size);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
protocol_error:
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
rxrpc_send_call_packet(call, RXRPC_PACKET_TYPE_ABORT);
|
2007-04-27 06:48:28 +08:00
|
|
|
_leave(" = -EPROTO");
|
|
|
|
return -EPROTO;
|
|
|
|
|
|
|
|
nomem:
|
|
|
|
_leave(" = -ENOMEM");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* wholly decrypt a packet (level 2 security)
|
|
|
|
*/
|
2016-09-07 05:19:51 +08:00
|
|
|
static int rxkad_verify_packet_2(struct rxrpc_call *call, struct sk_buff *skb,
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
unsigned int offset, unsigned int len,
|
2016-09-07 05:19:51 +08:00
|
|
|
rxrpc_seq_t seq)
|
2007-04-27 06:48:28 +08:00
|
|
|
{
|
2009-09-14 09:17:35 +08:00
|
|
|
const struct rxrpc_key_token *token;
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxkad_level2_hdr sechdr;
|
2016-01-24 21:19:01 +08:00
|
|
|
SKCIPHER_REQUEST_ON_STACK(req, call->conn->cipher);
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_crypt iv;
|
|
|
|
struct scatterlist _sg[4], *sg;
|
|
|
|
struct sk_buff *trailer;
|
|
|
|
u32 data_size, buf;
|
|
|
|
u16 check;
|
|
|
|
int nsg;
|
|
|
|
|
|
|
|
_enter(",{%d}", skb->len);
|
|
|
|
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
if (len < 8) {
|
2016-09-07 05:19:51 +08:00
|
|
|
rxrpc_abort_call("V2H", call, seq, RXKADSEALEDINCON, EPROTO);
|
|
|
|
goto protocol_error;
|
|
|
|
}
|
2007-04-27 06:48:28 +08:00
|
|
|
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
/* Decrypt the skbuff in-place. TODO: We really want to decrypt
|
|
|
|
* directly into the target buffer.
|
|
|
|
*/
|
2007-04-27 06:48:28 +08:00
|
|
|
nsg = skb_cow_data(skb, 0, &trailer);
|
|
|
|
if (nsg < 0)
|
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
sg = _sg;
|
|
|
|
if (unlikely(nsg > 4)) {
|
|
|
|
sg = kmalloc(sizeof(*sg) * nsg, GFP_NOIO);
|
|
|
|
if (!sg)
|
|
|
|
goto nomem;
|
|
|
|
}
|
|
|
|
|
2007-10-27 15:52:07 +08:00
|
|
|
sg_init_table(sg, nsg);
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
skb_to_sgvec(skb, sg, offset, len);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
/* decrypt from the session key */
|
2016-04-04 21:00:36 +08:00
|
|
|
token = call->conn->params.key->payload.data[0];
|
2009-09-14 09:17:35 +08:00
|
|
|
memcpy(&iv, token->kad->session_key, sizeof(iv));
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-01-24 21:19:01 +08:00
|
|
|
skcipher_request_set_tfm(req, call->conn->cipher);
|
|
|
|
skcipher_request_set_callback(req, 0, NULL, NULL);
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
skcipher_request_set_crypt(req, sg, sg, len, iv.x);
|
2016-01-24 21:19:01 +08:00
|
|
|
crypto_skcipher_decrypt(req);
|
|
|
|
skcipher_request_zero(req);
|
2007-04-27 06:48:28 +08:00
|
|
|
if (sg != _sg)
|
|
|
|
kfree(sg);
|
|
|
|
|
2016-09-07 05:19:51 +08:00
|
|
|
/* Extract the decrypted packet length */
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
if (skb_copy_bits(skb, offset, &sechdr, sizeof(sechdr)) < 0) {
|
2016-09-07 05:19:51 +08:00
|
|
|
rxrpc_abort_call("XV2", call, seq, RXKADDATALEN, EPROTO);
|
|
|
|
goto protocol_error;
|
|
|
|
}
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
offset += sizeof(sechdr);
|
|
|
|
len -= sizeof(sechdr);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
buf = ntohl(sechdr.data_size);
|
|
|
|
data_size = buf & 0xffff;
|
|
|
|
|
|
|
|
check = buf >> 16;
|
2016-09-07 05:19:51 +08:00
|
|
|
check ^= seq ^ call->call_id;
|
2007-04-27 06:48:28 +08:00
|
|
|
check &= 0xffff;
|
|
|
|
if (check != 0) {
|
2016-09-07 05:19:51 +08:00
|
|
|
rxrpc_abort_call("V2C", call, seq, RXKADSEALEDINCON, EPROTO);
|
2007-04-27 06:48:28 +08:00
|
|
|
goto protocol_error;
|
|
|
|
}
|
|
|
|
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
if (data_size > len) {
|
2016-09-07 05:19:51 +08:00
|
|
|
rxrpc_abort_call("V2L", call, seq, RXKADDATALEN, EPROTO);
|
|
|
|
goto protocol_error;
|
|
|
|
}
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
_leave(" = 0 [dlen=%x]", data_size);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
protocol_error:
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
rxrpc_send_call_packet(call, RXRPC_PACKET_TYPE_ABORT);
|
2007-04-27 06:48:28 +08:00
|
|
|
_leave(" = -EPROTO");
|
|
|
|
return -EPROTO;
|
|
|
|
|
|
|
|
nomem:
|
|
|
|
_leave(" = -ENOMEM");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2016-09-07 05:19:51 +08:00
|
|
|
* Verify the security on a received packet or subpacket (if part of a
|
|
|
|
* jumbo packet).
|
2007-04-27 06:48:28 +08:00
|
|
|
*/
|
2016-09-07 05:19:51 +08:00
|
|
|
static int rxkad_verify_packet(struct rxrpc_call *call, struct sk_buff *skb,
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
unsigned int offset, unsigned int len,
|
2016-09-07 05:19:51 +08:00
|
|
|
rxrpc_seq_t seq, u16 expected_cksum)
|
2007-04-27 06:48:28 +08:00
|
|
|
{
|
2016-01-24 21:19:01 +08:00
|
|
|
SKCIPHER_REQUEST_ON_STACK(req, call->conn->cipher);
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_crypt iv;
|
2016-06-27 05:55:24 +08:00
|
|
|
struct scatterlist sg;
|
2016-03-04 23:53:46 +08:00
|
|
|
u16 cksum;
|
|
|
|
u32 x, y;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
_enter("{%d{%x}},{#%u}",
|
2016-09-07 05:19:51 +08:00
|
|
|
call->debug_id, key_serial(call->conn->params.key), seq);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
if (!call->conn->cipher)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* continue encrypting from where we left off */
|
|
|
|
memcpy(&iv, call->conn->csum_iv.x, sizeof(iv));
|
|
|
|
|
|
|
|
/* validate the security checksum */
|
2016-08-23 22:27:24 +08:00
|
|
|
x = (call->cid & RXRPC_CHANNELMASK) << (32 - RXRPC_CIDSHIFT);
|
2016-09-07 05:19:51 +08:00
|
|
|
x |= seq & 0x3fffffff;
|
2016-06-27 05:55:24 +08:00
|
|
|
call->crypto_buf[0] = htonl(call->call_id);
|
|
|
|
call->crypto_buf[1] = htonl(x);
|
2016-01-24 21:19:01 +08:00
|
|
|
|
2016-06-27 05:55:24 +08:00
|
|
|
sg_init_one(&sg, call->crypto_buf, 8);
|
2016-01-24 21:19:01 +08:00
|
|
|
skcipher_request_set_tfm(req, call->conn->cipher);
|
|
|
|
skcipher_request_set_callback(req, 0, NULL, NULL);
|
2016-06-27 05:55:24 +08:00
|
|
|
skcipher_request_set_crypt(req, &sg, &sg, 8, iv.x);
|
2016-01-24 21:19:01 +08:00
|
|
|
crypto_skcipher_encrypt(req);
|
|
|
|
skcipher_request_zero(req);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-06-27 05:55:24 +08:00
|
|
|
y = ntohl(call->crypto_buf[1]);
|
2016-03-04 23:53:46 +08:00
|
|
|
cksum = (y >> 16) & 0xffff;
|
|
|
|
if (cksum == 0)
|
|
|
|
cksum = 1; /* zero checksums are not permitted */
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-09-07 05:19:51 +08:00
|
|
|
if (cksum != expected_cksum) {
|
|
|
|
rxrpc_abort_call("VCK", call, seq, RXKADSEALEDINCON, EPROTO);
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
rxrpc_send_call_packet(call, RXRPC_PACKET_TYPE_ABORT);
|
2007-04-27 06:48:28 +08:00
|
|
|
_leave(" = -EPROTO [csum failed]");
|
|
|
|
return -EPROTO;
|
|
|
|
}
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
switch (call->conn->params.security_level) {
|
2007-04-27 06:48:28 +08:00
|
|
|
case RXRPC_SECURITY_PLAIN:
|
2016-09-07 05:19:51 +08:00
|
|
|
return 0;
|
2007-04-27 06:48:28 +08:00
|
|
|
case RXRPC_SECURITY_AUTH:
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
return rxkad_verify_packet_1(call, skb, offset, len, seq);
|
2007-04-27 06:48:28 +08:00
|
|
|
case RXRPC_SECURITY_ENCRYPT:
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
return rxkad_verify_packet_2(call, skb, offset, len, seq);
|
2007-04-27 06:48:28 +08:00
|
|
|
default:
|
2016-09-07 05:19:51 +08:00
|
|
|
return -ENOANO;
|
2007-04-27 06:48:28 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
/*
|
|
|
|
* Locate the data contained in a packet that was partially encrypted.
|
|
|
|
*/
|
|
|
|
static void rxkad_locate_data_1(struct rxrpc_call *call, struct sk_buff *skb,
|
|
|
|
unsigned int *_offset, unsigned int *_len)
|
|
|
|
{
|
|
|
|
struct rxkad_level1_hdr sechdr;
|
|
|
|
|
|
|
|
if (skb_copy_bits(skb, *_offset, &sechdr, sizeof(sechdr)) < 0)
|
|
|
|
BUG();
|
|
|
|
*_offset += sizeof(sechdr);
|
|
|
|
*_len = ntohl(sechdr.data_size) & 0xffff;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Locate the data contained in a packet that was completely encrypted.
|
|
|
|
*/
|
|
|
|
static void rxkad_locate_data_2(struct rxrpc_call *call, struct sk_buff *skb,
|
|
|
|
unsigned int *_offset, unsigned int *_len)
|
|
|
|
{
|
|
|
|
struct rxkad_level2_hdr sechdr;
|
|
|
|
|
|
|
|
if (skb_copy_bits(skb, *_offset, &sechdr, sizeof(sechdr)) < 0)
|
|
|
|
BUG();
|
|
|
|
*_offset += sizeof(sechdr);
|
|
|
|
*_len = ntohl(sechdr.data_size) & 0xffff;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Locate the data contained in an already decrypted packet.
|
|
|
|
*/
|
|
|
|
static void rxkad_locate_data(struct rxrpc_call *call, struct sk_buff *skb,
|
|
|
|
unsigned int *_offset, unsigned int *_len)
|
|
|
|
{
|
|
|
|
switch (call->conn->params.security_level) {
|
|
|
|
case RXRPC_SECURITY_AUTH:
|
|
|
|
rxkad_locate_data_1(call, skb, _offset, _len);
|
|
|
|
return;
|
|
|
|
case RXRPC_SECURITY_ENCRYPT:
|
|
|
|
rxkad_locate_data_2(call, skb, _offset, _len);
|
|
|
|
return;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-04-27 06:48:28 +08:00
|
|
|
/*
|
|
|
|
* issue a challenge
|
|
|
|
*/
|
|
|
|
static int rxkad_issue_challenge(struct rxrpc_connection *conn)
|
|
|
|
{
|
|
|
|
struct rxkad_challenge challenge;
|
2016-03-04 23:53:46 +08:00
|
|
|
struct rxrpc_wire_header whdr;
|
2007-04-27 06:48:28 +08:00
|
|
|
struct msghdr msg;
|
|
|
|
struct kvec iov[2];
|
|
|
|
size_t len;
|
2016-03-04 23:53:46 +08:00
|
|
|
u32 serial;
|
2007-04-27 06:48:28 +08:00
|
|
|
int ret;
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
_enter("{%d,%x}", conn->debug_id, key_serial(conn->params.key));
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
ret = key_validate(conn->params.key);
|
2007-04-27 06:48:28 +08:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
get_random_bytes(&conn->security_nonce, sizeof(conn->security_nonce));
|
|
|
|
|
|
|
|
challenge.version = htonl(2);
|
|
|
|
challenge.nonce = htonl(conn->security_nonce);
|
|
|
|
challenge.min_level = htonl(0);
|
|
|
|
challenge.__padding = 0;
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
msg.msg_name = &conn->params.peer->srx.transport.sin;
|
|
|
|
msg.msg_namelen = sizeof(conn->params.peer->srx.transport.sin);
|
2007-04-27 06:48:28 +08:00
|
|
|
msg.msg_control = NULL;
|
|
|
|
msg.msg_controllen = 0;
|
|
|
|
msg.msg_flags = 0;
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
whdr.epoch = htonl(conn->proto.epoch);
|
|
|
|
whdr.cid = htonl(conn->proto.cid);
|
2016-03-04 23:53:46 +08:00
|
|
|
whdr.callNumber = 0;
|
|
|
|
whdr.seq = 0;
|
|
|
|
whdr.type = RXRPC_PACKET_TYPE_CHALLENGE;
|
|
|
|
whdr.flags = conn->out_clientflag;
|
|
|
|
whdr.userStatus = 0;
|
|
|
|
whdr.securityIndex = conn->security_ix;
|
|
|
|
whdr._rsvd = 0;
|
2016-04-04 21:00:36 +08:00
|
|
|
whdr.serviceId = htons(conn->params.service_id);
|
2016-03-04 23:53:46 +08:00
|
|
|
|
|
|
|
iov[0].iov_base = &whdr;
|
|
|
|
iov[0].iov_len = sizeof(whdr);
|
2007-04-27 06:48:28 +08:00
|
|
|
iov[1].iov_base = &challenge;
|
|
|
|
iov[1].iov_len = sizeof(challenge);
|
|
|
|
|
|
|
|
len = iov[0].iov_len + iov[1].iov_len;
|
|
|
|
|
2016-03-04 23:53:46 +08:00
|
|
|
serial = atomic_inc_return(&conn->serial);
|
|
|
|
whdr.serial = htonl(serial);
|
|
|
|
_proto("Tx CHALLENGE %%%u", serial);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
ret = kernel_sendmsg(conn->params.local->socket, &msg, iov, 2, len);
|
2007-04-27 06:48:28 +08:00
|
|
|
if (ret < 0) {
|
|
|
|
_debug("sendmsg failed: %d", ret);
|
|
|
|
return -EAGAIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
_leave(" = 0");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* send a Kerberos security response
|
|
|
|
*/
|
|
|
|
static int rxkad_send_response(struct rxrpc_connection *conn,
|
2016-03-04 23:53:46 +08:00
|
|
|
struct rxrpc_host_header *hdr,
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxkad_response *resp,
|
|
|
|
const struct rxkad_key *s2)
|
|
|
|
{
|
2016-03-04 23:53:46 +08:00
|
|
|
struct rxrpc_wire_header whdr;
|
2007-04-27 06:48:28 +08:00
|
|
|
struct msghdr msg;
|
|
|
|
struct kvec iov[3];
|
|
|
|
size_t len;
|
2016-03-04 23:53:46 +08:00
|
|
|
u32 serial;
|
2007-04-27 06:48:28 +08:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
_enter("");
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
msg.msg_name = &conn->params.peer->srx.transport.sin;
|
|
|
|
msg.msg_namelen = sizeof(conn->params.peer->srx.transport.sin);
|
2007-04-27 06:48:28 +08:00
|
|
|
msg.msg_control = NULL;
|
|
|
|
msg.msg_controllen = 0;
|
|
|
|
msg.msg_flags = 0;
|
|
|
|
|
2016-03-04 23:53:46 +08:00
|
|
|
memset(&whdr, 0, sizeof(whdr));
|
|
|
|
whdr.epoch = htonl(hdr->epoch);
|
|
|
|
whdr.cid = htonl(hdr->cid);
|
|
|
|
whdr.type = RXRPC_PACKET_TYPE_RESPONSE;
|
|
|
|
whdr.flags = conn->out_clientflag;
|
|
|
|
whdr.securityIndex = hdr->securityIndex;
|
|
|
|
whdr.serviceId = htons(hdr->serviceId);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-03-04 23:53:46 +08:00
|
|
|
iov[0].iov_base = &whdr;
|
|
|
|
iov[0].iov_len = sizeof(whdr);
|
2007-04-27 06:48:28 +08:00
|
|
|
iov[1].iov_base = resp;
|
|
|
|
iov[1].iov_len = sizeof(*resp);
|
2016-03-04 23:53:46 +08:00
|
|
|
iov[2].iov_base = (void *)s2->ticket;
|
2007-04-27 06:48:28 +08:00
|
|
|
iov[2].iov_len = s2->ticket_len;
|
|
|
|
|
|
|
|
len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
|
|
|
|
|
2016-03-04 23:53:46 +08:00
|
|
|
serial = atomic_inc_return(&conn->serial);
|
|
|
|
whdr.serial = htonl(serial);
|
|
|
|
_proto("Tx RESPONSE %%%u", serial);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
ret = kernel_sendmsg(conn->params.local->socket, &msg, iov, 3, len);
|
2007-04-27 06:48:28 +08:00
|
|
|
if (ret < 0) {
|
|
|
|
_debug("sendmsg failed: %d", ret);
|
|
|
|
return -EAGAIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
_leave(" = 0");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* calculate the response checksum
|
|
|
|
*/
|
|
|
|
static void rxkad_calc_response_checksum(struct rxkad_response *response)
|
|
|
|
{
|
|
|
|
u32 csum = 1000003;
|
|
|
|
int loop;
|
|
|
|
u8 *p = (u8 *) response;
|
|
|
|
|
|
|
|
for (loop = sizeof(*response); loop > 0; loop--)
|
|
|
|
csum = csum * 0x10204081 + *p++;
|
|
|
|
|
|
|
|
response->encrypted.checksum = htonl(csum);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* encrypt the response packet
|
|
|
|
*/
|
|
|
|
static void rxkad_encrypt_response(struct rxrpc_connection *conn,
|
|
|
|
struct rxkad_response *resp,
|
|
|
|
const struct rxkad_key *s2)
|
|
|
|
{
|
2016-01-24 21:19:01 +08:00
|
|
|
SKCIPHER_REQUEST_ON_STACK(req, conn->cipher);
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_crypt iv;
|
2016-06-27 05:55:24 +08:00
|
|
|
struct scatterlist sg[1];
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
/* continue encrypting from where we left off */
|
|
|
|
memcpy(&iv, s2->session_key, sizeof(iv));
|
|
|
|
|
2016-06-27 05:55:24 +08:00
|
|
|
sg_init_table(sg, 1);
|
|
|
|
sg_set_buf(sg, &resp->encrypted, sizeof(resp->encrypted));
|
2016-01-24 21:19:01 +08:00
|
|
|
skcipher_request_set_tfm(req, conn->cipher);
|
|
|
|
skcipher_request_set_callback(req, 0, NULL, NULL);
|
|
|
|
skcipher_request_set_crypt(req, sg, sg, sizeof(resp->encrypted), iv.x);
|
|
|
|
crypto_skcipher_encrypt(req);
|
|
|
|
skcipher_request_zero(req);
|
2007-04-27 06:48:28 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* respond to a challenge packet
|
|
|
|
*/
|
|
|
|
static int rxkad_respond_to_challenge(struct rxrpc_connection *conn,
|
|
|
|
struct sk_buff *skb,
|
|
|
|
u32 *_abort_code)
|
|
|
|
{
|
2009-09-14 09:17:35 +08:00
|
|
|
const struct rxrpc_key_token *token;
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxkad_challenge challenge;
|
|
|
|
struct rxkad_response resp
|
|
|
|
__attribute__((aligned(8))); /* must be aligned for crypto */
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
|
2007-04-27 06:48:28 +08:00
|
|
|
u32 version, nonce, min_level, abort_code;
|
|
|
|
int ret;
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
_enter("{%d,%x}", conn->debug_id, key_serial(conn->params.key));
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
if (!conn->params.key) {
|
2007-04-27 06:48:28 +08:00
|
|
|
_leave(" = -EPROTO [no key]");
|
|
|
|
return -EPROTO;
|
|
|
|
}
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
ret = key_validate(conn->params.key);
|
2007-04-27 06:48:28 +08:00
|
|
|
if (ret < 0) {
|
|
|
|
*_abort_code = RXKADEXPIRED;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
abort_code = RXKADPACKETSHORT;
|
2016-09-30 20:26:03 +08:00
|
|
|
if (skb_copy_bits(skb, sizeof(struct rxrpc_wire_header),
|
|
|
|
&challenge, sizeof(challenge)) < 0)
|
2007-04-27 06:48:28 +08:00
|
|
|
goto protocol_error;
|
|
|
|
|
|
|
|
version = ntohl(challenge.version);
|
|
|
|
nonce = ntohl(challenge.nonce);
|
|
|
|
min_level = ntohl(challenge.min_level);
|
|
|
|
|
|
|
|
_proto("Rx CHALLENGE %%%u { v=%u n=%u ml=%u }",
|
2016-03-04 23:53:46 +08:00
|
|
|
sp->hdr.serial, version, nonce, min_level);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
abort_code = RXKADINCONSISTENCY;
|
|
|
|
if (version != RXKAD_VERSION)
|
|
|
|
goto protocol_error;
|
|
|
|
|
|
|
|
abort_code = RXKADLEVELFAIL;
|
2016-04-04 21:00:36 +08:00
|
|
|
if (conn->params.security_level < min_level)
|
2007-04-27 06:48:28 +08:00
|
|
|
goto protocol_error;
|
|
|
|
|
2016-04-04 21:00:36 +08:00
|
|
|
token = conn->params.key->payload.data[0];
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
/* build the response packet */
|
|
|
|
memset(&resp, 0, sizeof(resp));
|
|
|
|
|
2016-03-04 23:59:00 +08:00
|
|
|
resp.version = htonl(RXKAD_VERSION);
|
2016-04-04 21:00:36 +08:00
|
|
|
resp.encrypted.epoch = htonl(conn->proto.epoch);
|
|
|
|
resp.encrypted.cid = htonl(conn->proto.cid);
|
2016-03-04 23:59:00 +08:00
|
|
|
resp.encrypted.securityIndex = htonl(conn->security_ix);
|
|
|
|
resp.encrypted.inc_nonce = htonl(nonce + 1);
|
2016-04-04 21:00:36 +08:00
|
|
|
resp.encrypted.level = htonl(conn->params.security_level);
|
2016-03-04 23:59:00 +08:00
|
|
|
resp.kvno = htonl(token->kad->kvno);
|
|
|
|
resp.ticket_len = htonl(token->kad->ticket_len);
|
|
|
|
|
rxrpc: Call channels should have separate call number spaces
Each channel on a connection has a separate, independent number space from
which to allocate callNumber values. It is entirely possible, for example,
to have a connection with four active calls, each with call number 1.
Note that the callNumber values for any particular channel don't have to
start at 1, but they are supposed to increment monotonically for that
channel from a client's perspective and may not be reused once the call
number is transmitted (until the epoch cycles all the way back round).
Currently, however, call numbers are allocated on a per-connection basis
and, further, are held in an rb-tree. The rb-tree is redundant as the four
channel pointers in the rxrpc_connection struct are entirely capable of
pointing to all the calls currently in progress on a connection.
To this end, make the following changes:
(1) Handle call number allocation independently per channel.
(2) Get rid of the conn->calls rb-tree. This is overkill as a connection
may have a maximum of four calls in progress at any one time. Use the
pointers in the channels[] array instead, indexed by the channel
number from the packet.
(3) For each channel, save the result of the last call that was in
progress on that channel in conn->channels[] so that the final ACK or
ABORT packet can be replayed if necessary. Any call earlier than that
is just ignored. If we've seen the next call number in a packet, the
last one is most definitely defunct.
(4) When generating a RESPONSE packet for a connection, the call number
counter for each channel must be included in it.
(5) When parsing a RESPONSE packet for a connection, the call number
counters contained therein should be used to set the minimum expected
call numbers on each channel.
To do in future commits:
(1) Replay terminal packets based on the last call stored in
conn->channels[].
(2) Connections should be retired before the callNumber space on any
channel runs out.
(3) A server is expected to disregard or reject any new incoming call that
has a call number less than the current call number counter. The call
number counter for that channel must be advanced to the new call
number.
Note that the server cannot just require that the next call that it
sees on a channel be exactly the call number counter + 1 because then
there's a scenario that could cause a problem: The client transmits a
packet to initiate a connection, the network goes out, the server
sends an ACK (which gets lost), the client sends an ABORT (which also
gets lost); the network then reconnects, the client then reuses the
call number for the next call (it doesn't know the server already saw
the call number), but the server thinks it already has the first
packet of this call (it doesn't know that the client doesn't know that
it saw the call number the first time).
Signed-off-by: David Howells <dhowells@redhat.com>
2016-06-27 21:39:44 +08:00
|
|
|
resp.encrypted.call_id[0] = htonl(conn->channels[0].call_counter);
|
|
|
|
resp.encrypted.call_id[1] = htonl(conn->channels[1].call_counter);
|
|
|
|
resp.encrypted.call_id[2] = htonl(conn->channels[2].call_counter);
|
|
|
|
resp.encrypted.call_id[3] = htonl(conn->channels[3].call_counter);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
/* calculate the response checksum and then do the encryption */
|
|
|
|
rxkad_calc_response_checksum(&resp);
|
2009-09-14 09:17:35 +08:00
|
|
|
rxkad_encrypt_response(conn, &resp, token->kad);
|
|
|
|
return rxkad_send_response(conn, &sp->hdr, &resp, token->kad);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
protocol_error:
|
|
|
|
*_abort_code = abort_code;
|
|
|
|
_leave(" = -EPROTO [%d]", abort_code);
|
|
|
|
return -EPROTO;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* decrypt the kerberos IV ticket in the response
|
|
|
|
*/
|
|
|
|
static int rxkad_decrypt_ticket(struct rxrpc_connection *conn,
|
|
|
|
void *ticket, size_t ticket_len,
|
|
|
|
struct rxrpc_crypt *_session_key,
|
|
|
|
time_t *_expiry,
|
|
|
|
u32 *_abort_code)
|
|
|
|
{
|
2016-01-24 21:19:01 +08:00
|
|
|
struct skcipher_request *req;
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_crypt iv, key;
|
2007-10-27 15:52:07 +08:00
|
|
|
struct scatterlist sg[1];
|
2007-04-27 06:48:28 +08:00
|
|
|
struct in_addr addr;
|
2012-04-15 13:58:06 +08:00
|
|
|
unsigned int life;
|
2007-04-27 06:48:28 +08:00
|
|
|
time_t issue, now;
|
|
|
|
bool little_endian;
|
|
|
|
int ret;
|
|
|
|
u8 *p, *q, *name, *end;
|
|
|
|
|
|
|
|
_enter("{%d},{%x}", conn->debug_id, key_serial(conn->server_key));
|
|
|
|
|
|
|
|
*_expiry = 0;
|
|
|
|
|
|
|
|
ret = key_validate(conn->server_key);
|
|
|
|
if (ret < 0) {
|
|
|
|
switch (ret) {
|
|
|
|
case -EKEYEXPIRED:
|
|
|
|
*_abort_code = RXKADEXPIRED;
|
|
|
|
goto error;
|
|
|
|
default:
|
|
|
|
*_abort_code = RXKADNOAUTH;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-21 21:04:48 +08:00
|
|
|
ASSERT(conn->server_key->payload.data[0] != NULL);
|
2007-04-27 06:48:28 +08:00
|
|
|
ASSERTCMP((unsigned long) ticket & 7UL, ==, 0);
|
|
|
|
|
2015-10-21 21:04:48 +08:00
|
|
|
memcpy(&iv, &conn->server_key->payload.data[2], sizeof(iv));
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2016-01-24 21:19:01 +08:00
|
|
|
req = skcipher_request_alloc(conn->server_key->payload.data[0],
|
|
|
|
GFP_NOFS);
|
|
|
|
if (!req) {
|
|
|
|
*_abort_code = RXKADNOAUTH;
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto error;
|
|
|
|
}
|
2007-04-27 06:48:28 +08:00
|
|
|
|
2007-10-27 15:52:07 +08:00
|
|
|
sg_init_one(&sg[0], ticket, ticket_len);
|
2016-01-24 21:19:01 +08:00
|
|
|
skcipher_request_set_callback(req, 0, NULL, NULL);
|
|
|
|
skcipher_request_set_crypt(req, sg, sg, ticket_len, iv.x);
|
|
|
|
crypto_skcipher_decrypt(req);
|
|
|
|
skcipher_request_free(req);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
p = ticket;
|
|
|
|
end = p + ticket_len;
|
|
|
|
|
|
|
|
#define Z(size) \
|
|
|
|
({ \
|
|
|
|
u8 *__str = p; \
|
|
|
|
q = memchr(p, 0, end - p); \
|
|
|
|
if (!q || q - p > (size)) \
|
|
|
|
goto bad_ticket; \
|
|
|
|
for (; p < q; p++) \
|
|
|
|
if (!isprint(*p)) \
|
|
|
|
goto bad_ticket; \
|
|
|
|
p++; \
|
|
|
|
__str; \
|
|
|
|
})
|
|
|
|
|
|
|
|
/* extract the ticket flags */
|
|
|
|
_debug("KIV FLAGS: %x", *p);
|
|
|
|
little_endian = *p & 1;
|
|
|
|
p++;
|
|
|
|
|
|
|
|
/* extract the authentication name */
|
|
|
|
name = Z(ANAME_SZ);
|
|
|
|
_debug("KIV ANAME: %s", name);
|
|
|
|
|
|
|
|
/* extract the principal's instance */
|
|
|
|
name = Z(INST_SZ);
|
|
|
|
_debug("KIV INST : %s", name);
|
|
|
|
|
|
|
|
/* extract the principal's authentication domain */
|
|
|
|
name = Z(REALM_SZ);
|
|
|
|
_debug("KIV REALM: %s", name);
|
|
|
|
|
|
|
|
if (end - p < 4 + 8 + 4 + 2)
|
|
|
|
goto bad_ticket;
|
|
|
|
|
|
|
|
/* get the IPv4 address of the entity that requested the ticket */
|
|
|
|
memcpy(&addr, p, sizeof(addr));
|
|
|
|
p += 4;
|
2008-10-31 15:54:56 +08:00
|
|
|
_debug("KIV ADDR : %pI4", &addr);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
/* get the session key from the ticket */
|
|
|
|
memcpy(&key, p, sizeof(key));
|
|
|
|
p += 8;
|
|
|
|
_debug("KIV KEY : %08x %08x", ntohl(key.n[0]), ntohl(key.n[1]));
|
|
|
|
memcpy(_session_key, &key, sizeof(key));
|
|
|
|
|
|
|
|
/* get the ticket's lifetime */
|
|
|
|
life = *p++ * 5 * 60;
|
|
|
|
_debug("KIV LIFE : %u", life);
|
|
|
|
|
|
|
|
/* get the issue time of the ticket */
|
|
|
|
if (little_endian) {
|
|
|
|
__le32 stamp;
|
|
|
|
memcpy(&stamp, p, 4);
|
|
|
|
issue = le32_to_cpu(stamp);
|
|
|
|
} else {
|
|
|
|
__be32 stamp;
|
|
|
|
memcpy(&stamp, p, 4);
|
|
|
|
issue = be32_to_cpu(stamp);
|
|
|
|
}
|
|
|
|
p += 4;
|
2007-07-25 08:47:43 +08:00
|
|
|
now = get_seconds();
|
2007-04-27 06:48:28 +08:00
|
|
|
_debug("KIV ISSUE: %lx [%lx]", issue, now);
|
|
|
|
|
|
|
|
/* check the ticket is in date */
|
|
|
|
if (issue > now) {
|
|
|
|
*_abort_code = RXKADNOAUTH;
|
|
|
|
ret = -EKEYREJECTED;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (issue < now - life) {
|
|
|
|
*_abort_code = RXKADEXPIRED;
|
|
|
|
ret = -EKEYEXPIRED;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
*_expiry = issue + life;
|
|
|
|
|
|
|
|
/* get the service name */
|
|
|
|
name = Z(SNAME_SZ);
|
|
|
|
_debug("KIV SNAME: %s", name);
|
|
|
|
|
|
|
|
/* get the service instance name */
|
|
|
|
name = Z(INST_SZ);
|
|
|
|
_debug("KIV SINST: %s", name);
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
error:
|
|
|
|
_leave(" = %d", ret);
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
bad_ticket:
|
|
|
|
*_abort_code = RXKADBADTICKET;
|
|
|
|
ret = -EBADMSG;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* decrypt the response packet
|
|
|
|
*/
|
|
|
|
static void rxkad_decrypt_response(struct rxrpc_connection *conn,
|
|
|
|
struct rxkad_response *resp,
|
|
|
|
const struct rxrpc_crypt *session_key)
|
|
|
|
{
|
2016-01-24 21:19:01 +08:00
|
|
|
SKCIPHER_REQUEST_ON_STACK(req, rxkad_ci);
|
2016-06-27 05:55:24 +08:00
|
|
|
struct scatterlist sg[1];
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_crypt iv;
|
|
|
|
|
|
|
|
_enter(",,%08x%08x",
|
|
|
|
ntohl(session_key->n[0]), ntohl(session_key->n[1]));
|
|
|
|
|
|
|
|
ASSERT(rxkad_ci != NULL);
|
|
|
|
|
|
|
|
mutex_lock(&rxkad_ci_mutex);
|
2016-01-24 21:19:01 +08:00
|
|
|
if (crypto_skcipher_setkey(rxkad_ci, session_key->x,
|
|
|
|
sizeof(*session_key)) < 0)
|
2007-04-27 06:48:28 +08:00
|
|
|
BUG();
|
|
|
|
|
|
|
|
memcpy(&iv, session_key, sizeof(iv));
|
|
|
|
|
2016-06-27 05:55:24 +08:00
|
|
|
sg_init_table(sg, 1);
|
|
|
|
sg_set_buf(sg, &resp->encrypted, sizeof(resp->encrypted));
|
2016-01-24 21:19:01 +08:00
|
|
|
skcipher_request_set_tfm(req, rxkad_ci);
|
|
|
|
skcipher_request_set_callback(req, 0, NULL, NULL);
|
|
|
|
skcipher_request_set_crypt(req, sg, sg, sizeof(resp->encrypted), iv.x);
|
|
|
|
crypto_skcipher_decrypt(req);
|
|
|
|
skcipher_request_zero(req);
|
|
|
|
|
2007-04-27 06:48:28 +08:00
|
|
|
mutex_unlock(&rxkad_ci_mutex);
|
|
|
|
|
|
|
|
_leave("");
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* verify a response
|
|
|
|
*/
|
|
|
|
static int rxkad_verify_response(struct rxrpc_connection *conn,
|
|
|
|
struct sk_buff *skb,
|
|
|
|
u32 *_abort_code)
|
|
|
|
{
|
|
|
|
struct rxkad_response response
|
|
|
|
__attribute__((aligned(8))); /* must be aligned for crypto */
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
|
2007-04-27 06:48:28 +08:00
|
|
|
struct rxrpc_crypt session_key;
|
|
|
|
time_t expiry;
|
|
|
|
void *ticket;
|
2008-03-29 11:08:38 +08:00
|
|
|
u32 abort_code, version, kvno, ticket_len, level;
|
|
|
|
__be32 csum;
|
rxrpc: Call channels should have separate call number spaces
Each channel on a connection has a separate, independent number space from
which to allocate callNumber values. It is entirely possible, for example,
to have a connection with four active calls, each with call number 1.
Note that the callNumber values for any particular channel don't have to
start at 1, but they are supposed to increment monotonically for that
channel from a client's perspective and may not be reused once the call
number is transmitted (until the epoch cycles all the way back round).
Currently, however, call numbers are allocated on a per-connection basis
and, further, are held in an rb-tree. The rb-tree is redundant as the four
channel pointers in the rxrpc_connection struct are entirely capable of
pointing to all the calls currently in progress on a connection.
To this end, make the following changes:
(1) Handle call number allocation independently per channel.
(2) Get rid of the conn->calls rb-tree. This is overkill as a connection
may have a maximum of four calls in progress at any one time. Use the
pointers in the channels[] array instead, indexed by the channel
number from the packet.
(3) For each channel, save the result of the last call that was in
progress on that channel in conn->channels[] so that the final ACK or
ABORT packet can be replayed if necessary. Any call earlier than that
is just ignored. If we've seen the next call number in a packet, the
last one is most definitely defunct.
(4) When generating a RESPONSE packet for a connection, the call number
counter for each channel must be included in it.
(5) When parsing a RESPONSE packet for a connection, the call number
counters contained therein should be used to set the minimum expected
call numbers on each channel.
To do in future commits:
(1) Replay terminal packets based on the last call stored in
conn->channels[].
(2) Connections should be retired before the callNumber space on any
channel runs out.
(3) A server is expected to disregard or reject any new incoming call that
has a call number less than the current call number counter. The call
number counter for that channel must be advanced to the new call
number.
Note that the server cannot just require that the next call that it
sees on a channel be exactly the call number counter + 1 because then
there's a scenario that could cause a problem: The client transmits a
packet to initiate a connection, the network goes out, the server
sends an ACK (which gets lost), the client sends an ABORT (which also
gets lost); the network then reconnects, the client then reuses the
call number for the next call (it doesn't know the server already saw
the call number), but the server thinks it already has the first
packet of this call (it doesn't know that the client doesn't know that
it saw the call number the first time).
Signed-off-by: David Howells <dhowells@redhat.com>
2016-06-27 21:39:44 +08:00
|
|
|
int ret, i;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
_enter("{%d,%x}", conn->debug_id, key_serial(conn->server_key));
|
|
|
|
|
|
|
|
abort_code = RXKADPACKETSHORT;
|
2016-09-30 20:26:03 +08:00
|
|
|
if (skb_copy_bits(skb, sizeof(struct rxrpc_wire_header),
|
|
|
|
&response, sizeof(response)) < 0)
|
2007-04-27 06:48:28 +08:00
|
|
|
goto protocol_error;
|
|
|
|
if (!pskb_pull(skb, sizeof(response)))
|
|
|
|
BUG();
|
|
|
|
|
|
|
|
version = ntohl(response.version);
|
|
|
|
ticket_len = ntohl(response.ticket_len);
|
|
|
|
kvno = ntohl(response.kvno);
|
|
|
|
_proto("Rx RESPONSE %%%u { v=%u kv=%u tl=%u }",
|
2016-03-04 23:53:46 +08:00
|
|
|
sp->hdr.serial, version, kvno, ticket_len);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
abort_code = RXKADINCONSISTENCY;
|
|
|
|
if (version != RXKAD_VERSION)
|
2007-12-07 20:31:47 +08:00
|
|
|
goto protocol_error;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
abort_code = RXKADTICKETLEN;
|
|
|
|
if (ticket_len < 4 || ticket_len > MAXKRB5TICKETLEN)
|
|
|
|
goto protocol_error;
|
|
|
|
|
|
|
|
abort_code = RXKADUNKNOWNKEY;
|
|
|
|
if (kvno >= RXKAD_TKT_TYPE_KERBEROS_V5)
|
|
|
|
goto protocol_error;
|
|
|
|
|
|
|
|
/* extract the kerberos ticket and decrypt and decode it */
|
|
|
|
ticket = kmalloc(ticket_len, GFP_NOFS);
|
|
|
|
if (!ticket)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
abort_code = RXKADPACKETSHORT;
|
2016-09-30 20:26:03 +08:00
|
|
|
if (skb_copy_bits(skb, sizeof(struct rxrpc_wire_header),
|
|
|
|
ticket, ticket_len) < 0)
|
2007-04-27 06:48:28 +08:00
|
|
|
goto protocol_error_free;
|
|
|
|
|
|
|
|
ret = rxkad_decrypt_ticket(conn, ticket, ticket_len, &session_key,
|
|
|
|
&expiry, &abort_code);
|
|
|
|
if (ret < 0) {
|
|
|
|
*_abort_code = abort_code;
|
|
|
|
kfree(ticket);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* use the session key from inside the ticket to decrypt the
|
|
|
|
* response */
|
|
|
|
rxkad_decrypt_response(conn, &response, &session_key);
|
|
|
|
|
|
|
|
abort_code = RXKADSEALEDINCON;
|
2016-04-04 21:00:36 +08:00
|
|
|
if (ntohl(response.encrypted.epoch) != conn->proto.epoch)
|
2007-04-27 06:48:28 +08:00
|
|
|
goto protocol_error_free;
|
2016-04-04 21:00:36 +08:00
|
|
|
if (ntohl(response.encrypted.cid) != conn->proto.cid)
|
2007-04-27 06:48:28 +08:00
|
|
|
goto protocol_error_free;
|
|
|
|
if (ntohl(response.encrypted.securityIndex) != conn->security_ix)
|
|
|
|
goto protocol_error_free;
|
|
|
|
csum = response.encrypted.checksum;
|
|
|
|
response.encrypted.checksum = 0;
|
|
|
|
rxkad_calc_response_checksum(&response);
|
|
|
|
if (response.encrypted.checksum != csum)
|
|
|
|
goto protocol_error_free;
|
|
|
|
|
rxrpc: Call channels should have separate call number spaces
Each channel on a connection has a separate, independent number space from
which to allocate callNumber values. It is entirely possible, for example,
to have a connection with four active calls, each with call number 1.
Note that the callNumber values for any particular channel don't have to
start at 1, but they are supposed to increment monotonically for that
channel from a client's perspective and may not be reused once the call
number is transmitted (until the epoch cycles all the way back round).
Currently, however, call numbers are allocated on a per-connection basis
and, further, are held in an rb-tree. The rb-tree is redundant as the four
channel pointers in the rxrpc_connection struct are entirely capable of
pointing to all the calls currently in progress on a connection.
To this end, make the following changes:
(1) Handle call number allocation independently per channel.
(2) Get rid of the conn->calls rb-tree. This is overkill as a connection
may have a maximum of four calls in progress at any one time. Use the
pointers in the channels[] array instead, indexed by the channel
number from the packet.
(3) For each channel, save the result of the last call that was in
progress on that channel in conn->channels[] so that the final ACK or
ABORT packet can be replayed if necessary. Any call earlier than that
is just ignored. If we've seen the next call number in a packet, the
last one is most definitely defunct.
(4) When generating a RESPONSE packet for a connection, the call number
counter for each channel must be included in it.
(5) When parsing a RESPONSE packet for a connection, the call number
counters contained therein should be used to set the minimum expected
call numbers on each channel.
To do in future commits:
(1) Replay terminal packets based on the last call stored in
conn->channels[].
(2) Connections should be retired before the callNumber space on any
channel runs out.
(3) A server is expected to disregard or reject any new incoming call that
has a call number less than the current call number counter. The call
number counter for that channel must be advanced to the new call
number.
Note that the server cannot just require that the next call that it
sees on a channel be exactly the call number counter + 1 because then
there's a scenario that could cause a problem: The client transmits a
packet to initiate a connection, the network goes out, the server
sends an ACK (which gets lost), the client sends an ABORT (which also
gets lost); the network then reconnects, the client then reuses the
call number for the next call (it doesn't know the server already saw
the call number), but the server thinks it already has the first
packet of this call (it doesn't know that the client doesn't know that
it saw the call number the first time).
Signed-off-by: David Howells <dhowells@redhat.com>
2016-06-27 21:39:44 +08:00
|
|
|
spin_lock(&conn->channel_lock);
|
|
|
|
for (i = 0; i < RXRPC_MAXCALLS; i++) {
|
|
|
|
struct rxrpc_call *call;
|
|
|
|
u32 call_id = ntohl(response.encrypted.call_id[i]);
|
|
|
|
|
|
|
|
if (call_id > INT_MAX)
|
|
|
|
goto protocol_error_unlock;
|
|
|
|
|
|
|
|
if (call_id < conn->channels[i].call_counter)
|
|
|
|
goto protocol_error_unlock;
|
|
|
|
if (call_id > conn->channels[i].call_counter) {
|
|
|
|
call = rcu_dereference_protected(
|
|
|
|
conn->channels[i].call,
|
|
|
|
lockdep_is_held(&conn->channel_lock));
|
|
|
|
if (call && call->state < RXRPC_CALL_COMPLETE)
|
|
|
|
goto protocol_error_unlock;
|
|
|
|
conn->channels[i].call_counter = call_id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock(&conn->channel_lock);
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
abort_code = RXKADOUTOFSEQUENCE;
|
2016-03-04 23:53:46 +08:00
|
|
|
if (ntohl(response.encrypted.inc_nonce) != conn->security_nonce + 1)
|
2007-04-27 06:48:28 +08:00
|
|
|
goto protocol_error_free;
|
|
|
|
|
|
|
|
abort_code = RXKADLEVELFAIL;
|
|
|
|
level = ntohl(response.encrypted.level);
|
|
|
|
if (level > RXRPC_SECURITY_ENCRYPT)
|
|
|
|
goto protocol_error_free;
|
2016-04-04 21:00:36 +08:00
|
|
|
conn->params.security_level = level;
|
2007-04-27 06:48:28 +08:00
|
|
|
|
|
|
|
/* create a key to hold the security data and expiration time - after
|
|
|
|
* this the connection security can be handled in exactly the same way
|
|
|
|
* as for a client connection */
|
|
|
|
ret = rxrpc_get_server_data_key(conn, &session_key, expiry, kvno);
|
|
|
|
if (ret < 0) {
|
|
|
|
kfree(ticket);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
kfree(ticket);
|
|
|
|
_leave(" = 0");
|
|
|
|
return 0;
|
|
|
|
|
rxrpc: Call channels should have separate call number spaces
Each channel on a connection has a separate, independent number space from
which to allocate callNumber values. It is entirely possible, for example,
to have a connection with four active calls, each with call number 1.
Note that the callNumber values for any particular channel don't have to
start at 1, but they are supposed to increment monotonically for that
channel from a client's perspective and may not be reused once the call
number is transmitted (until the epoch cycles all the way back round).
Currently, however, call numbers are allocated on a per-connection basis
and, further, are held in an rb-tree. The rb-tree is redundant as the four
channel pointers in the rxrpc_connection struct are entirely capable of
pointing to all the calls currently in progress on a connection.
To this end, make the following changes:
(1) Handle call number allocation independently per channel.
(2) Get rid of the conn->calls rb-tree. This is overkill as a connection
may have a maximum of four calls in progress at any one time. Use the
pointers in the channels[] array instead, indexed by the channel
number from the packet.
(3) For each channel, save the result of the last call that was in
progress on that channel in conn->channels[] so that the final ACK or
ABORT packet can be replayed if necessary. Any call earlier than that
is just ignored. If we've seen the next call number in a packet, the
last one is most definitely defunct.
(4) When generating a RESPONSE packet for a connection, the call number
counter for each channel must be included in it.
(5) When parsing a RESPONSE packet for a connection, the call number
counters contained therein should be used to set the minimum expected
call numbers on each channel.
To do in future commits:
(1) Replay terminal packets based on the last call stored in
conn->channels[].
(2) Connections should be retired before the callNumber space on any
channel runs out.
(3) A server is expected to disregard or reject any new incoming call that
has a call number less than the current call number counter. The call
number counter for that channel must be advanced to the new call
number.
Note that the server cannot just require that the next call that it
sees on a channel be exactly the call number counter + 1 because then
there's a scenario that could cause a problem: The client transmits a
packet to initiate a connection, the network goes out, the server
sends an ACK (which gets lost), the client sends an ABORT (which also
gets lost); the network then reconnects, the client then reuses the
call number for the next call (it doesn't know the server already saw
the call number), but the server thinks it already has the first
packet of this call (it doesn't know that the client doesn't know that
it saw the call number the first time).
Signed-off-by: David Howells <dhowells@redhat.com>
2016-06-27 21:39:44 +08:00
|
|
|
protocol_error_unlock:
|
|
|
|
spin_unlock(&conn->channel_lock);
|
2007-04-27 06:48:28 +08:00
|
|
|
protocol_error_free:
|
|
|
|
kfree(ticket);
|
|
|
|
protocol_error:
|
|
|
|
*_abort_code = abort_code;
|
|
|
|
_leave(" = -EPROTO [%d]", abort_code);
|
|
|
|
return -EPROTO;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* clear the connection security
|
|
|
|
*/
|
|
|
|
static void rxkad_clear(struct rxrpc_connection *conn)
|
|
|
|
{
|
|
|
|
_enter("");
|
|
|
|
|
|
|
|
if (conn->cipher)
|
2016-01-24 21:19:01 +08:00
|
|
|
crypto_free_skcipher(conn->cipher);
|
2007-04-27 06:48:28 +08:00
|
|
|
}
|
|
|
|
|
2016-04-08 00:23:51 +08:00
|
|
|
/*
|
|
|
|
* Initialise the rxkad security service.
|
|
|
|
*/
|
|
|
|
static int rxkad_init(void)
|
|
|
|
{
|
|
|
|
/* pin the cipher we need so that the crypto layer doesn't invoke
|
|
|
|
* keventd to go get it */
|
|
|
|
rxkad_ci = crypto_alloc_skcipher("pcbc(fcrypt)", 0, CRYPTO_ALG_ASYNC);
|
2016-06-05 07:17:19 +08:00
|
|
|
return PTR_ERR_OR_ZERO(rxkad_ci);
|
2016-04-08 00:23:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Clean up the rxkad security service.
|
|
|
|
*/
|
|
|
|
static void rxkad_exit(void)
|
|
|
|
{
|
|
|
|
if (rxkad_ci)
|
|
|
|
crypto_free_skcipher(rxkad_ci);
|
|
|
|
}
|
|
|
|
|
2007-04-27 06:48:28 +08:00
|
|
|
/*
|
|
|
|
* RxRPC Kerberos-based security
|
|
|
|
*/
|
2016-04-08 00:23:51 +08:00
|
|
|
const struct rxrpc_security rxkad = {
|
2007-04-27 06:48:28 +08:00
|
|
|
.name = "rxkad",
|
2009-09-14 09:17:30 +08:00
|
|
|
.security_index = RXRPC_SECURITY_RXKAD,
|
2016-04-08 00:23:51 +08:00
|
|
|
.init = rxkad_init,
|
|
|
|
.exit = rxkad_exit,
|
2007-04-27 06:48:28 +08:00
|
|
|
.init_connection_security = rxkad_init_connection_security,
|
|
|
|
.prime_packet_security = rxkad_prime_packet_security,
|
|
|
|
.secure_packet = rxkad_secure_packet,
|
|
|
|
.verify_packet = rxkad_verify_packet,
|
rxrpc: Rewrite the data and ack handling code
Rewrite the data and ack handling code such that:
(1) Parsing of received ACK and ABORT packets and the distribution and the
filing of DATA packets happens entirely within the data_ready context
called from the UDP socket. This allows us to process and discard ACK
and ABORT packets much more quickly (they're no longer stashed on a
queue for a background thread to process).
(2) We avoid calling skb_clone(), pskb_pull() and pskb_trim(). We instead
keep track of the offset and length of the content of each packet in
the sk_buff metadata. This means we don't do any allocation in the
receive path.
(3) Jumbo DATA packet parsing is now done in data_ready context. Rather
than cloning the packet once for each subpacket and pulling/trimming
it, we file the packet multiple times with an annotation for each
indicating which subpacket is there. From that we can directly
calculate the offset and length.
(4) A call's receive queue can be accessed without taking locks (memory
barriers do have to be used, though).
(5) Incoming calls are set up from preallocated resources and immediately
made live. They can than have packets queued upon them and ACKs
generated. If insufficient resources exist, DATA packet #1 is given a
BUSY reply and other DATA packets are discarded).
(6) sk_buffs no longer take a ref on their parent call.
To make this work, the following changes are made:
(1) Each call's receive buffer is now a circular buffer of sk_buff
pointers (rxtx_buffer) rather than a number of sk_buff_heads spread
between the call and the socket. This permits each sk_buff to be in
the buffer multiple times. The receive buffer is reused for the
transmit buffer.
(2) A circular buffer of annotations (rxtx_annotations) is kept parallel
to the data buffer. Transmission phase annotations indicate whether a
buffered packet has been ACK'd or not and whether it needs
retransmission.
Receive phase annotations indicate whether a slot holds a whole packet
or a jumbo subpacket and, if the latter, which subpacket. They also
note whether the packet has been decrypted in place.
(3) DATA packet window tracking is much simplified. Each phase has just
two numbers representing the window (rx_hard_ack/rx_top and
tx_hard_ack/tx_top).
The hard_ack number is the sequence number before base of the window,
representing the last packet the other side says it has consumed.
hard_ack starts from 0 and the first packet is sequence number 1.
The top number is the sequence number of the highest-numbered packet
residing in the buffer. Packets between hard_ack+1 and top are
soft-ACK'd to indicate they've been received, but not yet consumed.
Four macros, before(), before_eq(), after() and after_eq() are added
to compare sequence numbers within the window. This allows for the
top of the window to wrap when the hard-ack sequence number gets close
to the limit.
Two flags, RXRPC_CALL_RX_LAST and RXRPC_CALL_TX_LAST, are added also
to indicate when rx_top and tx_top point at the packets with the
LAST_PACKET bit set, indicating the end of the phase.
(4) Calls are queued on the socket 'receive queue' rather than packets.
This means that we don't need have to invent dummy packets to queue to
indicate abnormal/terminal states and we don't have to keep metadata
packets (such as ABORTs) around
(5) The offset and length of a (sub)packet's content are now passed to
the verify_packet security op. This is currently expected to decrypt
the packet in place and validate it.
However, there's now nowhere to store the revised offset and length of
the actual data within the decrypted blob (there may be a header and
padding to skip) because an sk_buff may represent multiple packets, so
a locate_data security op is added to retrieve these details from the
sk_buff content when needed.
(6) recvmsg() now has to handle jumbo subpackets, where each subpacket is
individually secured and needs to be individually decrypted. The code
to do this is broken out into rxrpc_recvmsg_data() and shared with the
kernel API. It now iterates over the call's receive buffer rather
than walking the socket receive queue.
Additional changes:
(1) The timers are condensed to a single timer that is set for the soonest
of three timeouts (delayed ACK generation, DATA retransmission and
call lifespan).
(2) Transmission of ACK and ABORT packets is effected immediately from
process-context socket ops/kernel API calls that cause them instead of
them being punted off to a background work item. The data_ready
handler still has to defer to the background, though.
(3) A shutdown op is added to the AF_RXRPC socket so that the AFS
filesystem can shut down the socket and flush its own work items
before closing the socket to deal with any in-progress service calls.
Future additional changes that will need to be considered:
(1) Make sure that a call doesn't hog the front of the queue by receiving
data from the network as fast as userspace is consuming it to the
exclusion of other calls.
(2) Transmit delayed ACKs from within recvmsg() when we've consumed
sufficiently more packets to avoid the background work item needing to
run.
Signed-off-by: David Howells <dhowells@redhat.com>
2016-09-08 18:10:12 +08:00
|
|
|
.locate_data = rxkad_locate_data,
|
2007-04-27 06:48:28 +08:00
|
|
|
.issue_challenge = rxkad_issue_challenge,
|
|
|
|
.respond_to_challenge = rxkad_respond_to_challenge,
|
|
|
|
.verify_response = rxkad_verify_response,
|
|
|
|
.clear = rxkad_clear,
|
|
|
|
};
|