forked from luck/tmp_suning_uos_patched
tipc: add automatic session key exchange
With support from the master key option in the previous commit, it becomes easy to make frequent updates/exchanges of session keys between authenticated cluster nodes. Basically, there are two situations where the key exchange will take in place: - When a new node joins the cluster (with the master key), it will need to get its peer's TX key, so that be able to decrypt further messages from that peer. - When a new session key is generated (by either user manual setting or later automatic rekeying feature), the key will be distributed to all peer nodes in the cluster. A key to be exchanged is encapsulated in the data part of a 'MSG_CRYPTO /KEY_DISTR_MSG' TIPC v2 message, then xmit-ed as usual and encrypted by using the master key before sending out. Upon receipt of the message it will be decrypted in the same way as regular messages, then attached as the sender's RX key in the receiver node. In this way, the key exchange is reliable by the link layer, as well as security, integrity and authenticity by the crypto layer. Also, the forward security will be easily achieved by user changing the master key actively but this should not be required very frequently. The key exchange feature is independent on the presence of a master key Note however that the master key still is needed for new nodes to be able to join the cluster. It is also optional, and can be turned off/on via the sysfs: 'net/tipc/key_exchange_enabled' [default 1: enabled]. Backward compatibility is guaranteed because for nodes that do not have master key support, key exchange using master key ie. tx_key = 0 if any will be shortly discarded at the message validation step. In other words, the key exchange feature will be automatically disabled to those nodes. v2: fix the "implicit declaration of function 'tipc_crypto_key_flush'" error in node.c. The function only exists when built with the TIPC "CONFIG_TIPC_CRYPTO" option. v3: use 'info->extack' for a message emitted due to netlink operations instead (- David's comment). Reported-by: kernel test robot <lkp@intel.com> Acked-by: Jon Maloy <jmaloy@redhat.com> Signed-off-by: Tuong Lien <tuong.t.lien@dektech.com.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tuong Lien
David S. Miller
parent
daef1ee379
commit
1ef6f7c939
|
|
@ -37,6 +37,8 @@
|
|||
#include <crypto/aead.h>
|
||||
#include <crypto/aes.h>
|
||||
#include "crypto.h"
|
||||
#include "msg.h"
|
||||
#include "bcast.h"
|
||||
|
||||
#define TIPC_TX_GRACE_PERIOD msecs_to_jiffies(5000) /* 5s */
|
||||
#define TIPC_TX_LASTING_TIME msecs_to_jiffies(10000) /* 10s */
|
||||
|
|
@ -82,6 +84,8 @@ static const char *hstats[MAX_STATS] = {"ok", "nok", "async", "async_ok",
|
|||
|
||||
/* Max TFMs number per key */
|
||||
int sysctl_tipc_max_tfms __read_mostly = TIPC_MAX_TFMS_DEF;
|
||||
/* Key exchange switch, default: on */
|
||||
int sysctl_tipc_key_exchange_enabled __read_mostly = 1;
|
||||
|
||||
/**
|
||||
* struct tipc_key - TIPC keys' status indicator
|
||||
|
|
@ -133,6 +137,8 @@ struct tipc_tfm {
|
|||
* @mode: crypto mode is applied to the key
|
||||
* @hint[]: a hint for user key
|
||||
* @rcu: struct rcu_head
|
||||
* @key: the aead key
|
||||
* @gen: the key's generation
|
||||
* @seqno: the key seqno (cluster scope)
|
||||
* @refcnt: the key reference counter
|
||||
*/
|
||||
|
|
@ -147,6 +153,8 @@ struct tipc_aead {
|
|||
u8 mode;
|
||||
char hint[2 * TIPC_AEAD_HINT_LEN + 1];
|
||||
struct rcu_head rcu;
|
||||
struct tipc_aead_key *key;
|
||||
u16 gen;
|
||||
|
||||
atomic64_t seqno ____cacheline_aligned;
|
||||
refcount_t refcnt ____cacheline_aligned;
|
||||
|
|
@ -166,7 +174,13 @@ struct tipc_crypto_stats {
|
|||
* @node: TIPC node (RX)
|
||||
* @aead: array of pointers to AEAD keys for encryption/decryption
|
||||
* @peer_rx_active: replicated peer RX active key index
|
||||
* @key_gen: TX/RX key generation
|
||||
* @key: the key states
|
||||
* @skey_mode: session key's mode
|
||||
* @skey: received session key
|
||||
* @wq: common workqueue on TX crypto
|
||||
* @work: delayed work sched for TX/RX
|
||||
* @key_distr: key distributing state
|
||||
* @stats: the crypto statistics
|
||||
* @name: the crypto name
|
||||
* @sndnxt: the per-peer sndnxt (TX)
|
||||
|
|
@ -175,6 +189,7 @@ struct tipc_crypto_stats {
|
|||
* @working: the crypto is working or not
|
||||
* @key_master: flag indicates if master key exists
|
||||
* @legacy_user: flag indicates if a peer joins w/o master key (for bwd comp.)
|
||||
* @nokey: no key indication
|
||||
* @lock: tipc_key lock
|
||||
*/
|
||||
struct tipc_crypto {
|
||||
|
|
@ -182,7 +197,16 @@ struct tipc_crypto {
|
|||
struct tipc_node *node;
|
||||
struct tipc_aead __rcu *aead[KEY_MAX + 1];
|
||||
atomic_t peer_rx_active;
|
||||
u16 key_gen;
|
||||
struct tipc_key key;
|
||||
u8 skey_mode;
|
||||
struct tipc_aead_key *skey;
|
||||
struct workqueue_struct *wq;
|
||||
struct delayed_work work;
|
||||
#define KEY_DISTR_SCHED 1
|
||||
#define KEY_DISTR_COMPL 2
|
||||
atomic_t key_distr;
|
||||
|
||||
struct tipc_crypto_stats __percpu *stats;
|
||||
char name[48];
|
||||
|
||||
|
|
@ -194,6 +218,7 @@ struct tipc_crypto {
|
|||
u8 working:1;
|
||||
u8 key_master:1;
|
||||
u8 legacy_user:1;
|
||||
u8 nokey: 1;
|
||||
};
|
||||
u8 flags;
|
||||
};
|
||||
|
|
@ -266,6 +291,11 @@ static void tipc_crypto_do_cmd(struct net *net, int cmd);
|
|||
static char *tipc_crypto_key_dump(struct tipc_crypto *c, char *buf);
|
||||
static char *tipc_key_change_dump(struct tipc_key old, struct tipc_key new,
|
||||
char *buf);
|
||||
static int tipc_crypto_key_xmit(struct net *net, struct tipc_aead_key *skey,
|
||||
u16 gen, u8 mode, u32 dnode);
|
||||
static bool tipc_crypto_key_rcv(struct tipc_crypto *rx, struct tipc_msg *hdr);
|
||||
static void tipc_crypto_work_rx(struct work_struct *work);
|
||||
|
||||
#define is_tx(crypto) (!(crypto)->node)
|
||||
#define is_rx(crypto) (!is_tx(crypto))
|
||||
|
||||
|
|
@ -360,6 +390,7 @@ static void tipc_aead_free(struct rcu_head *rp)
|
|||
kfree(head);
|
||||
}
|
||||
free_percpu(aead->tfm_entry);
|
||||
kzfree(aead->key);
|
||||
kfree(aead);
|
||||
}
|
||||
|
||||
|
|
@ -530,6 +561,7 @@ static int tipc_aead_init(struct tipc_aead **aead, struct tipc_aead_key *ukey,
|
|||
tmp->mode = mode;
|
||||
tmp->cloned = NULL;
|
||||
tmp->authsize = TIPC_AES_GCM_TAG_SIZE;
|
||||
tmp->key = kmemdup(ukey, tipc_aead_key_size(ukey), GFP_KERNEL);
|
||||
memcpy(&tmp->salt, ukey->key + keylen, TIPC_AES_GCM_SALT_SIZE);
|
||||
atomic_set(&tmp->users, 0);
|
||||
atomic64_set(&tmp->seqno, 0);
|
||||
|
|
@ -1011,7 +1043,7 @@ static int tipc_ehdr_build(struct net *net, struct tipc_aead *aead,
|
|||
ehdr->tx_key = tx_key;
|
||||
ehdr->destined = (__rx) ? 1 : 0;
|
||||
ehdr->rx_key_active = (__rx) ? __rx->key.active : 0;
|
||||
ehdr->rx_nokey = (__rx) ? !__rx->key.keys : 0;
|
||||
ehdr->rx_nokey = (__rx) ? __rx->nokey : 0;
|
||||
ehdr->master_key = aead->crypto->key_master;
|
||||
ehdr->reserved_1 = 0;
|
||||
ehdr->reserved_2 = 0;
|
||||
|
|
@ -1130,11 +1162,13 @@ static int tipc_crypto_key_attach(struct tipc_crypto *c,
|
|||
|
||||
attach:
|
||||
aead->crypto = c;
|
||||
aead->gen = (is_tx(c)) ? ++c->key_gen : c->key_gen;
|
||||
tipc_aead_rcu_replace(c->aead[new_key], aead, &c->lock);
|
||||
if (likely(c->key.keys != key.keys))
|
||||
tipc_crypto_key_set_state(c, key.passive, key.active,
|
||||
key.pending);
|
||||
c->working = 1;
|
||||
c->nokey = 0;
|
||||
c->key_master |= master_key;
|
||||
rc = new_key;
|
||||
|
||||
|
|
@ -1145,14 +1179,33 @@ static int tipc_crypto_key_attach(struct tipc_crypto *c,
|
|||
|
||||
void tipc_crypto_key_flush(struct tipc_crypto *c)
|
||||
{
|
||||
struct tipc_crypto *tx, *rx;
|
||||
int k;
|
||||
|
||||
spin_lock_bh(&c->lock);
|
||||
if (is_rx(c)) {
|
||||
/* Try to cancel pending work */
|
||||
rx = c;
|
||||
tx = tipc_net(rx->net)->crypto_tx;
|
||||
if (cancel_delayed_work(&rx->work)) {
|
||||
kfree(rx->skey);
|
||||
rx->skey = NULL;
|
||||
atomic_xchg(&rx->key_distr, 0);
|
||||
tipc_node_put(rx->node);
|
||||
}
|
||||
/* RX stopping => decrease TX key users if any */
|
||||
k = atomic_xchg(&rx->peer_rx_active, 0);
|
||||
if (k) {
|
||||
tipc_aead_users_dec(tx->aead[k], 0);
|
||||
/* Mark the point TX key users changed */
|
||||
tx->timer1 = jiffies;
|
||||
}
|
||||
}
|
||||
|
||||
c->flags = 0;
|
||||
tipc_crypto_key_set_state(c, 0, 0, 0);
|
||||
for (k = KEY_MIN; k <= KEY_MAX; k++)
|
||||
tipc_crypto_key_detach(c->aead[k], &c->lock);
|
||||
atomic_set(&c->peer_rx_active, 0);
|
||||
atomic64_set(&c->sndnxt, 0);
|
||||
spin_unlock_bh(&c->lock);
|
||||
}
|
||||
|
|
@ -1298,7 +1351,8 @@ static struct tipc_aead *tipc_crypto_key_pick_tx(struct tipc_crypto *tx,
|
|||
* decreased correspondingly.
|
||||
*
|
||||
* It also considers if peer has no key, then we need to make own master key
|
||||
* (if any) taking over i.e. starting grace period.
|
||||
* (if any) taking over i.e. starting grace period and also trigger key
|
||||
* distributing process.
|
||||
*
|
||||
* The "per-peer" sndnxt is also reset when the peer key has switched.
|
||||
*/
|
||||
|
|
@ -1309,6 +1363,7 @@ static void tipc_crypto_key_synch(struct tipc_crypto *rx, struct sk_buff *skb)
|
|||
struct tipc_msg *hdr = buf_msg(skb);
|
||||
u32 self = tipc_own_addr(rx->net);
|
||||
u8 cur, new;
|
||||
unsigned long delay;
|
||||
|
||||
/* Update RX 'key_master' flag according to peer, also mark "legacy" if
|
||||
* a peer has no master key.
|
||||
|
|
@ -1322,9 +1377,22 @@ static void tipc_crypto_key_synch(struct tipc_crypto *rx, struct sk_buff *skb)
|
|||
return;
|
||||
|
||||
/* Case 1: Peer has no keys, let's make master key take over */
|
||||
if (ehdr->rx_nokey)
|
||||
if (ehdr->rx_nokey) {
|
||||
/* Set or extend grace period */
|
||||
tx->timer2 = jiffies;
|
||||
/* Schedule key distributing for the peer if not yet */
|
||||
if (tx->key.keys &&
|
||||
!atomic_cmpxchg(&rx->key_distr, 0, KEY_DISTR_SCHED)) {
|
||||
get_random_bytes(&delay, 2);
|
||||
delay %= 5;
|
||||
delay = msecs_to_jiffies(500 * ++delay);
|
||||
if (queue_delayed_work(tx->wq, &rx->work, delay))
|
||||
tipc_node_get(rx->node);
|
||||
}
|
||||
} else {
|
||||
/* Cancel a pending key distributing if any */
|
||||
atomic_xchg(&rx->key_distr, 0);
|
||||
}
|
||||
|
||||
/* Case 2: Peer RX active key has changed, let's update own TX users */
|
||||
cur = atomic_read(&rx->peer_rx_active);
|
||||
|
|
@ -1377,6 +1445,15 @@ int tipc_crypto_start(struct tipc_crypto **crypto, struct net *net,
|
|||
if (!c)
|
||||
return -ENOMEM;
|
||||
|
||||
/* Allocate workqueue on TX */
|
||||
if (!node) {
|
||||
c->wq = alloc_ordered_workqueue("tipc_crypto", 0);
|
||||
if (!c->wq) {
|
||||
kfree(c);
|
||||
return -ENOMEM;
|
||||
}
|
||||
}
|
||||
|
||||
/* Allocate statistic structure */
|
||||
c->stats = alloc_percpu_gfp(struct tipc_crypto_stats, GFP_ATOMIC);
|
||||
if (!c->stats) {
|
||||
|
|
@ -1387,7 +1464,9 @@ int tipc_crypto_start(struct tipc_crypto **crypto, struct net *net,
|
|||
c->flags = 0;
|
||||
c->net = net;
|
||||
c->node = node;
|
||||
get_random_bytes(&c->key_gen, 2);
|
||||
tipc_crypto_key_set_state(c, 0, 0, 0);
|
||||
atomic_set(&c->key_distr, 0);
|
||||
atomic_set(&c->peer_rx_active, 0);
|
||||
atomic64_set(&c->sndnxt, 0);
|
||||
c->timer1 = jiffies;
|
||||
|
|
@ -1397,32 +1476,27 @@ int tipc_crypto_start(struct tipc_crypto **crypto, struct net *net,
|
|||
(is_rx(c)) ? tipc_node_get_id_str(c->node) :
|
||||
tipc_own_id_string(c->net));
|
||||
|
||||
if (is_rx(c))
|
||||
INIT_DELAYED_WORK(&c->work, tipc_crypto_work_rx);
|
||||
|
||||
*crypto = c;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void tipc_crypto_stop(struct tipc_crypto **crypto)
|
||||
{
|
||||
struct tipc_crypto *c = *crypto, *tx, *rx;
|
||||
struct tipc_crypto *c = *crypto;
|
||||
u8 k;
|
||||
|
||||
if (!c)
|
||||
return;
|
||||
|
||||
rcu_read_lock();
|
||||
/* RX stopping? => decrease TX key users if any */
|
||||
if (is_rx(c)) {
|
||||
rx = c;
|
||||
tx = tipc_net(rx->net)->crypto_tx;
|
||||
k = atomic_read(&rx->peer_rx_active);
|
||||
if (k) {
|
||||
tipc_aead_users_dec(tx->aead[k], 0);
|
||||
/* Mark the point TX key users changed */
|
||||
tx->timer1 = jiffies;
|
||||
}
|
||||
}
|
||||
/* Flush any queued works & destroy wq */
|
||||
if (is_tx(c))
|
||||
destroy_workqueue(c->wq);
|
||||
|
||||
/* Release AEAD keys */
|
||||
rcu_read_lock();
|
||||
for (k = KEY_MIN; k <= KEY_MAX; k++)
|
||||
tipc_aead_put(rcu_dereference(c->aead[k]));
|
||||
rcu_read_unlock();
|
||||
|
|
@ -1621,6 +1695,7 @@ int tipc_crypto_xmit(struct net *net, struct sk_buff **skb,
|
|||
}
|
||||
if (user == LINK_CONFIG ||
|
||||
(user == LINK_PROTOCOL && type == RESET_MSG) ||
|
||||
(user == MSG_CRYPTO && type == KEY_DISTR_MSG) ||
|
||||
time_before(jiffies, tx->timer2 + TIPC_TX_GRACE_PERIOD)) {
|
||||
if (__rx && __rx->key_master &&
|
||||
!atomic_read(&__rx->peer_rx_active))
|
||||
|
|
@ -1705,7 +1780,7 @@ int tipc_crypto_rcv(struct net *net, struct tipc_crypto *rx,
|
|||
struct tipc_aead *aead = NULL;
|
||||
struct tipc_key key;
|
||||
int rc = -ENOKEY;
|
||||
u8 tx_key;
|
||||
u8 tx_key, n;
|
||||
|
||||
tx_key = ((struct tipc_ehdr *)(*skb)->data)->tx_key;
|
||||
|
||||
|
|
@ -1755,8 +1830,19 @@ int tipc_crypto_rcv(struct net *net, struct tipc_crypto *rx,
|
|||
if (rc == -ENOKEY) {
|
||||
kfree_skb(*skb);
|
||||
*skb = NULL;
|
||||
if (rx)
|
||||
if (rx) {
|
||||
/* Mark rx->nokey only if we dont have a
|
||||
* pending received session key, nor a newer
|
||||
* one i.e. in the next slot.
|
||||
*/
|
||||
n = key_next(tx_key);
|
||||
rx->nokey = !(rx->skey ||
|
||||
rcu_access_pointer(rx->aead[n]));
|
||||
pr_debug_ratelimited("%s: nokey %d, key %d/%x\n",
|
||||
rx->name, rx->nokey,
|
||||
tx_key, rx->key.keys);
|
||||
tipc_node_put(rx->node);
|
||||
}
|
||||
this_cpu_inc(stats->stat[STAT_NOKEYS]);
|
||||
return rc;
|
||||
} else if (rc == -EBADMSG) {
|
||||
|
|
@ -2025,3 +2111,243 @@ static char *tipc_key_change_dump(struct tipc_key old, struct tipc_key new,
|
|||
i += scnprintf(buf + i, 32 - i, "]");
|
||||
return buf;
|
||||
}
|
||||
|
||||
/**
|
||||
* tipc_crypto_msg_rcv - Common 'MSG_CRYPTO' processing point
|
||||
* @net: the struct net
|
||||
* @skb: the receiving message buffer
|
||||
*/
|
||||
void tipc_crypto_msg_rcv(struct net *net, struct sk_buff *skb)
|
||||
{
|
||||
struct tipc_crypto *rx;
|
||||
struct tipc_msg *hdr;
|
||||
|
||||
if (unlikely(skb_linearize(skb)))
|
||||
goto exit;
|
||||
|
||||
hdr = buf_msg(skb);
|
||||
rx = tipc_node_crypto_rx_by_addr(net, msg_prevnode(hdr));
|
||||
if (unlikely(!rx))
|
||||
goto exit;
|
||||
|
||||
switch (msg_type(hdr)) {
|
||||
case KEY_DISTR_MSG:
|
||||
if (tipc_crypto_key_rcv(rx, hdr))
|
||||
goto exit;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
tipc_node_put(rx->node);
|
||||
|
||||
exit:
|
||||
kfree_skb(skb);
|
||||
}
|
||||
|
||||
/**
|
||||
* tipc_crypto_key_distr - Distribute a TX key
|
||||
* @tx: the TX crypto
|
||||
* @key: the key's index
|
||||
* @dest: the destination tipc node, = NULL if distributing to all nodes
|
||||
*
|
||||
* Return: 0 in case of success, otherwise < 0
|
||||
*/
|
||||
int tipc_crypto_key_distr(struct tipc_crypto *tx, u8 key,
|
||||
struct tipc_node *dest)
|
||||
{
|
||||
struct tipc_aead *aead;
|
||||
u32 dnode = tipc_node_get_addr(dest);
|
||||
int rc = -ENOKEY;
|
||||
|
||||
if (!sysctl_tipc_key_exchange_enabled)
|
||||
return 0;
|
||||
|
||||
if (key) {
|
||||
rcu_read_lock();
|
||||
aead = tipc_aead_get(tx->aead[key]);
|
||||
if (likely(aead)) {
|
||||
rc = tipc_crypto_key_xmit(tx->net, aead->key,
|
||||
aead->gen, aead->mode,
|
||||
dnode);
|
||||
tipc_aead_put(aead);
|
||||
}
|
||||
rcu_read_unlock();
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
/**
|
||||
* tipc_crypto_key_xmit - Send a session key
|
||||
* @net: the struct net
|
||||
* @skey: the session key to be sent
|
||||
* @gen: the key's generation
|
||||
* @mode: the key's mode
|
||||
* @dnode: the destination node address, = 0 if broadcasting to all nodes
|
||||
*
|
||||
* The session key 'skey' is packed in a TIPC v2 'MSG_CRYPTO/KEY_DISTR_MSG'
|
||||
* as its data section, then xmit-ed through the uc/bc link.
|
||||
*
|
||||
* Return: 0 in case of success, otherwise < 0
|
||||
*/
|
||||
static int tipc_crypto_key_xmit(struct net *net, struct tipc_aead_key *skey,
|
||||
u16 gen, u8 mode, u32 dnode)
|
||||
{
|
||||
struct sk_buff_head pkts;
|
||||
struct tipc_msg *hdr;
|
||||
struct sk_buff *skb;
|
||||
u16 size, cong_link_cnt;
|
||||
u8 *data;
|
||||
int rc;
|
||||
|
||||
size = tipc_aead_key_size(skey);
|
||||
skb = tipc_buf_acquire(INT_H_SIZE + size, GFP_ATOMIC);
|
||||
if (!skb)
|
||||
return -ENOMEM;
|
||||
|
||||
hdr = buf_msg(skb);
|
||||
tipc_msg_init(tipc_own_addr(net), hdr, MSG_CRYPTO, KEY_DISTR_MSG,
|
||||
INT_H_SIZE, dnode);
|
||||
msg_set_size(hdr, INT_H_SIZE + size);
|
||||
msg_set_key_gen(hdr, gen);
|
||||
msg_set_key_mode(hdr, mode);
|
||||
|
||||
data = msg_data(hdr);
|
||||
*((__be32 *)(data + TIPC_AEAD_ALG_NAME)) = htonl(skey->keylen);
|
||||
memcpy(data, skey->alg_name, TIPC_AEAD_ALG_NAME);
|
||||
memcpy(data + TIPC_AEAD_ALG_NAME + sizeof(__be32), skey->key,
|
||||
skey->keylen);
|
||||
|
||||
__skb_queue_head_init(&pkts);
|
||||
__skb_queue_tail(&pkts, skb);
|
||||
if (dnode)
|
||||
rc = tipc_node_xmit(net, &pkts, dnode, 0);
|
||||
else
|
||||
rc = tipc_bcast_xmit(net, &pkts, &cong_link_cnt);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
/**
|
||||
* tipc_crypto_key_rcv - Receive a session key
|
||||
* @rx: the RX crypto
|
||||
* @hdr: the TIPC v2 message incl. the receiving session key in its data
|
||||
*
|
||||
* This function retrieves the session key in the message from peer, then
|
||||
* schedules a RX work to attach the key to the corresponding RX crypto.
|
||||
*
|
||||
* Return: "true" if the key has been scheduled for attaching, otherwise
|
||||
* "false".
|
||||
*/
|
||||
static bool tipc_crypto_key_rcv(struct tipc_crypto *rx, struct tipc_msg *hdr)
|
||||
{
|
||||
struct tipc_crypto *tx = tipc_net(rx->net)->crypto_tx;
|
||||
struct tipc_aead_key *skey = NULL;
|
||||
u16 key_gen = msg_key_gen(hdr);
|
||||
u16 size = msg_data_sz(hdr);
|
||||
u8 *data = msg_data(hdr);
|
||||
|
||||
spin_lock(&rx->lock);
|
||||
if (unlikely(rx->skey || (key_gen == rx->key_gen && rx->key.keys))) {
|
||||
pr_err("%s: key existed <%p>, gen %d vs %d\n", rx->name,
|
||||
rx->skey, key_gen, rx->key_gen);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
/* Allocate memory for the key */
|
||||
skey = kmalloc(size, GFP_ATOMIC);
|
||||
if (unlikely(!skey)) {
|
||||
pr_err("%s: unable to allocate memory for skey\n", rx->name);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
/* Copy key from msg data */
|
||||
skey->keylen = ntohl(*((__be32 *)(data + TIPC_AEAD_ALG_NAME)));
|
||||
memcpy(skey->alg_name, data, TIPC_AEAD_ALG_NAME);
|
||||
memcpy(skey->key, data + TIPC_AEAD_ALG_NAME + sizeof(__be32),
|
||||
skey->keylen);
|
||||
|
||||
/* Sanity check */
|
||||
if (unlikely(size != tipc_aead_key_size(skey))) {
|
||||
kfree(skey);
|
||||
skey = NULL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
rx->key_gen = key_gen;
|
||||
rx->skey_mode = msg_key_mode(hdr);
|
||||
rx->skey = skey;
|
||||
rx->nokey = 0;
|
||||
mb(); /* for nokey flag */
|
||||
|
||||
exit:
|
||||
spin_unlock(&rx->lock);
|
||||
|
||||
/* Schedule the key attaching on this crypto */
|
||||
if (likely(skey && queue_delayed_work(tx->wq, &rx->work, 0)))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* tipc_crypto_work_rx - Scheduled RX works handler
|
||||
* @work: the struct RX work
|
||||
*
|
||||
* The function processes the previous scheduled works i.e. distributing TX key
|
||||
* or attaching a received session key on RX crypto.
|
||||
*/
|
||||
static void tipc_crypto_work_rx(struct work_struct *work)
|
||||
{
|
||||
struct delayed_work *dwork = to_delayed_work(work);
|
||||
struct tipc_crypto *rx = container_of(dwork, struct tipc_crypto, work);
|
||||
struct tipc_crypto *tx = tipc_net(rx->net)->crypto_tx;
|
||||
unsigned long delay = msecs_to_jiffies(5000);
|
||||
bool resched = false;
|
||||
u8 key;
|
||||
int rc;
|
||||
|
||||
/* Case 1: Distribute TX key to peer if scheduled */
|
||||
if (atomic_cmpxchg(&rx->key_distr,
|
||||
KEY_DISTR_SCHED,
|
||||
KEY_DISTR_COMPL) == KEY_DISTR_SCHED) {
|
||||
/* Always pick the newest one for distributing */
|
||||
key = tx->key.pending ?: tx->key.active;
|
||||
rc = tipc_crypto_key_distr(tx, key, rx->node);
|
||||
if (unlikely(rc))
|
||||
pr_warn("%s: unable to distr key[%d] to %s, err %d\n",
|
||||
tx->name, key, tipc_node_get_id_str(rx->node),
|
||||
rc);
|
||||
|
||||
/* Sched for key_distr releasing */
|
||||
resched = true;
|
||||
} else {
|
||||
atomic_cmpxchg(&rx->key_distr, KEY_DISTR_COMPL, 0);
|
||||
}
|
||||
|
||||
/* Case 2: Attach a pending received session key from peer if any */
|
||||
if (rx->skey) {
|
||||
rc = tipc_crypto_key_init(rx, rx->skey, rx->skey_mode, false);
|
||||
if (unlikely(rc < 0))
|
||||
pr_warn("%s: unable to attach received skey, err %d\n",
|
||||
rx->name, rc);
|
||||
switch (rc) {
|
||||
case -EBUSY:
|
||||
case -ENOMEM:
|
||||
/* Resched the key attaching */
|
||||
resched = true;
|
||||
break;
|
||||
default:
|
||||
synchronize_rcu();
|
||||
kfree(rx->skey);
|
||||
rx->skey = NULL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (resched && queue_delayed_work(tx->wq, &rx->work, delay))
|
||||
return;
|
||||
|
||||
tipc_node_put(rx->node);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ enum {
|
|||
};
|
||||
|
||||
extern int sysctl_tipc_max_tfms __read_mostly;
|
||||
extern int sysctl_tipc_key_exchange_enabled __read_mostly;
|
||||
|
||||
/**
|
||||
* TIPC encryption message format:
|
||||
|
|
@ -167,8 +168,31 @@ int tipc_crypto_rcv(struct net *net, struct tipc_crypto *rx,
|
|||
int tipc_crypto_key_init(struct tipc_crypto *c, struct tipc_aead_key *ukey,
|
||||
u8 mode, bool master_key);
|
||||
void tipc_crypto_key_flush(struct tipc_crypto *c);
|
||||
int tipc_crypto_key_distr(struct tipc_crypto *tx, u8 key,
|
||||
struct tipc_node *dest);
|
||||
void tipc_crypto_msg_rcv(struct net *net, struct sk_buff *skb);
|
||||
int tipc_aead_key_validate(struct tipc_aead_key *ukey, struct genl_info *info);
|
||||
bool tipc_ehdr_validate(struct sk_buff *skb);
|
||||
|
||||
static inline u32 msg_key_gen(struct tipc_msg *m)
|
||||
{
|
||||
return msg_bits(m, 4, 16, 0xffff);
|
||||
}
|
||||
|
||||
static inline void msg_set_key_gen(struct tipc_msg *m, u32 gen)
|
||||
{
|
||||
msg_set_bits(m, 4, 16, 0xffff, gen);
|
||||
}
|
||||
|
||||
static inline u32 msg_key_mode(struct tipc_msg *m)
|
||||
{
|
||||
return msg_bits(m, 4, 0, 0xf);
|
||||
}
|
||||
|
||||
static inline void msg_set_key_mode(struct tipc_msg *m, u32 mode)
|
||||
{
|
||||
msg_set_bits(m, 4, 0, 0xf, mode);
|
||||
}
|
||||
|
||||
#endif /* _TIPC_CRYPTO_H */
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1250,6 +1250,11 @@ static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb,
|
|||
case MSG_FRAGMENTER:
|
||||
case BCAST_PROTOCOL:
|
||||
return false;
|
||||
#ifdef CONFIG_TIPC_CRYPTO
|
||||
case MSG_CRYPTO:
|
||||
tipc_crypto_msg_rcv(l->net, skb);
|
||||
return true;
|
||||
#endif
|
||||
default:
|
||||
pr_warn("Dropping received illegal msg type\n");
|
||||
kfree_skb(skb);
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ struct plist;
|
|||
#define NAME_DISTRIBUTOR 11
|
||||
#define MSG_FRAGMENTER 12
|
||||
#define LINK_CONFIG 13
|
||||
#define MSG_CRYPTO 14
|
||||
#define SOCK_WAKEUP 14 /* pseudo user */
|
||||
#define TOP_SRV 15 /* pseudo user */
|
||||
|
||||
|
|
@ -749,6 +750,9 @@ static inline void msg_set_nameupper(struct tipc_msg *m, u32 n)
|
|||
#define GRP_RECLAIM_MSG 4
|
||||
#define GRP_REMIT_MSG 5
|
||||
|
||||
/* Crypto message types */
|
||||
#define KEY_DISTR_MSG 0
|
||||
|
||||
/*
|
||||
* Word 1
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -278,6 +278,14 @@ struct tipc_crypto *tipc_node_crypto_rx_by_list(struct list_head *pos)
|
|||
{
|
||||
return container_of(pos, struct tipc_node, list)->crypto_rx;
|
||||
}
|
||||
|
||||
struct tipc_crypto *tipc_node_crypto_rx_by_addr(struct net *net, u32 addr)
|
||||
{
|
||||
struct tipc_node *n;
|
||||
|
||||
n = tipc_node_find(net, addr);
|
||||
return (n) ? n->crypto_rx : NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void tipc_node_free(struct rcu_head *rp)
|
||||
|
|
@ -303,7 +311,7 @@ void tipc_node_put(struct tipc_node *node)
|
|||
kref_put(&node->kref, tipc_node_kref_release);
|
||||
}
|
||||
|
||||
static void tipc_node_get(struct tipc_node *node)
|
||||
void tipc_node_get(struct tipc_node *node)
|
||||
{
|
||||
kref_get(&node->kref);
|
||||
}
|
||||
|
|
@ -584,6 +592,9 @@ static void tipc_node_calculate_timer(struct tipc_node *n, struct tipc_link *l)
|
|||
|
||||
static void tipc_node_delete_from_list(struct tipc_node *node)
|
||||
{
|
||||
#ifdef CONFIG_TIPC_CRYPTO
|
||||
tipc_crypto_key_flush(node->crypto_rx);
|
||||
#endif
|
||||
list_del_rcu(&node->list);
|
||||
hlist_del_rcu(&node->hash);
|
||||
tipc_node_put(node);
|
||||
|
|
@ -2930,6 +2941,10 @@ static int __tipc_nl_node_set_key(struct sk_buff *skb, struct genl_info *info)
|
|||
if (unlikely(rc < 0)) {
|
||||
GENL_SET_ERR_MSG(info, "unable to initiate or attach new key");
|
||||
return rc;
|
||||
} else if (c == tx) {
|
||||
/* Distribute TX key but not master one */
|
||||
if (!master_key && tipc_crypto_key_distr(tx, rc, NULL))
|
||||
GENL_SET_ERR_MSG(info, "failed to replicate new key");
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -79,12 +79,14 @@ bool tipc_node_get_id(struct net *net, u32 addr, u8 *id);
|
|||
u32 tipc_node_get_addr(struct tipc_node *node);
|
||||
char *tipc_node_get_id_str(struct tipc_node *node);
|
||||
void tipc_node_put(struct tipc_node *node);
|
||||
void tipc_node_get(struct tipc_node *node);
|
||||
struct tipc_node *tipc_node_create(struct net *net, u32 addr, u8 *peer_id,
|
||||
u16 capabilities, u32 hash_mixes,
|
||||
bool preliminary);
|
||||
#ifdef CONFIG_TIPC_CRYPTO
|
||||
struct tipc_crypto *tipc_node_crypto_rx(struct tipc_node *__n);
|
||||
struct tipc_crypto *tipc_node_crypto_rx_by_list(struct list_head *pos);
|
||||
struct tipc_crypto *tipc_node_crypto_rx_by_addr(struct net *net, u32 addr);
|
||||
#endif
|
||||
u32 tipc_node_try_addr(struct net *net, u8 *id, u32 addr);
|
||||
void tipc_node_check_dest(struct net *net, u32 onode, u8 *peer_id128,
|
||||
|
|
|
|||
|
|
@ -74,6 +74,15 @@ static struct ctl_table tipc_table[] = {
|
|||
.proc_handler = proc_dointvec_minmax,
|
||||
.extra1 = SYSCTL_ONE,
|
||||
},
|
||||
{
|
||||
.procname = "key_exchange_enabled",
|
||||
.data = &sysctl_tipc_key_exchange_enabled,
|
||||
.maxlen = sizeof(sysctl_tipc_key_exchange_enabled),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.extra1 = SYSCTL_ZERO,
|
||||
.extra2 = SYSCTL_ONE,
|
||||
},
|
||||
#endif
|
||||
{
|
||||
.procname = "bc_retruni",
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user