| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20260204-psp-v1-1-5f034e2dfa36@gmail.com>
Date: Wed, 04 Feb 2026 07:20:05 -0800
From: Daniel Zahka <daniel.zahka@...il.com>
To: "David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, Simon Horman <horms@...nel.org>,
Donald Hunter <donald.hunter@...il.com>, Boris Pismenny <borisp@...dia.com>,
Saeed Mahameed <saeedm@...dia.com>, Leon Romanovsky <leon@...nel.org>,
Tariq Toukan <tariqt@...dia.com>, Mark Bloch <mbloch@...dia.com>,
Andrew Lunn <andrew+netdev@...n.ch>, Shuah Khan <shuah@...nel.org>,
Willem de Bruijn <willemdebruijn.kernel@...il.com>
Cc: netdev@...r.kernel.org, linux-kselftest@...r.kernel.org,
Daniel Zahka <daniel.zahka@...il.com>
Subject: [PATCH net-next 1/9] psp: support rx rekey operation
Support rx-assoc netlink operation on an already keyed socket.
Performing an rx-rekey on a socket involves splicing a new psp_assoc
object with newly generated rx state and reused tx state into a
socket's psp_assoc field. Add a 'prev' field to struct psp_assoc,
because we need to be able to accept skb's matching the previous
assoc. For SADB implementations, after copying the tx state of the
assoc, we need to mark the prior assoc as not needing tx key
cleanup. The 'tx_moved' field is introduced to struct psp_assoc for
this purpose.
With this change, skb's matching the current or previous psp_assoc
will be accepted. It might be reasonable to stop accepting skb's on
the previous assoc after seeing skb's with the new assoc and after
waiting a grace period, but that is not implemented for now.
Signed-off-by: Daniel Zahka <daniel.zahka@...il.com>
---
include/net/psp/functions.h | 6 ++++++
include/net/psp/types.h | 3 +++
net/psp/psp.h | 6 +++---
net/psp/psp_nl.c | 6 +-----
net/psp/psp_sock.c | 41 +++++++++++++++++++++++++++--------------
5 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/include/net/psp/functions.h b/include/net/psp/functions.h
index c5c23a54774e..0f8b16f2f093 100644
--- a/include/net/psp/functions.h
+++ b/include/net/psp/functions.h
@@ -103,6 +103,12 @@ __psp_sk_rx_policy_check(struct sk_buff *skb, struct psp_assoc *pas)
return 0;
}
+ if (pas->prev && psp_pse_matches_pas(pse, pas->prev)) {
+ pas->peer_tx = 1;
+ pas->prev->peer_tx = 1;
+ return 0;
+ }
+
if (!pse) {
if (!pas->tx.spi ||
(!pas->peer_tx && psp_is_allowed_nondata(skb, pas)))
diff --git a/include/net/psp/types.h b/include/net/psp/types.h
index 25a9096d4e7d..52844ac6f870 100644
--- a/include/net/psp/types.h
+++ b/include/net/psp/types.h
@@ -139,6 +139,9 @@ struct psp_assoc {
u32 upgrade_seq;
+ struct psp_assoc *prev;
+
+ bool tx_moved;
struct psp_key_parsed tx;
struct psp_key_parsed rx;
diff --git a/net/psp/psp.h b/net/psp/psp.h
index 9f19137593a0..b86539d5137a 100644
--- a/net/psp/psp.h
+++ b/net/psp/psp.h
@@ -21,9 +21,9 @@ void psp_nl_notify_dev(struct psp_dev *psd, u32 cmd);
struct psp_assoc *psp_assoc_create(struct psp_dev *psd);
struct psp_dev *psp_dev_get_for_sock(struct sock *sk);
void psp_dev_tx_key_del(struct psp_dev *psd, struct psp_assoc *pas);
-int psp_sock_assoc_set_rx(struct sock *sk, struct psp_assoc *pas,
- struct psp_key_parsed *key,
- struct netlink_ext_ack *extack);
+void psp_sock_assoc_set_rx(struct sock *sk, struct psp_assoc *pas,
+ struct psp_key_parsed *key,
+ struct netlink_ext_ack *extack);
int psp_sock_assoc_set_tx(struct sock *sk, struct psp_dev *psd,
u32 version, struct psp_key_parsed *key,
struct netlink_ext_ack *extack);
diff --git a/net/psp/psp_nl.c b/net/psp/psp_nl.c
index 6afd7707ec12..a540a1e77694 100644
--- a/net/psp/psp_nl.c
+++ b/net/psp/psp_nl.c
@@ -446,11 +446,7 @@ int psp_nl_rx_assoc_doit(struct sk_buff *skb, struct genl_info *info)
goto err_free_pas;
}
- err = psp_sock_assoc_set_rx(socket->sk, pas, &key, info->extack);
- if (err) {
- NL_SET_BAD_ATTR(info->extack, info->attrs[PSP_A_ASSOC_SOCK_FD]);
- goto err_free_pas;
- }
+ psp_sock_assoc_set_rx(socket->sk, pas, &key, info->extack);
psp_assoc_put(pas);
return psp_nl_reply_send(rsp, info);
diff --git a/net/psp/psp_sock.c b/net/psp/psp_sock.c
index f785672b7df6..3a8abd023f99 100644
--- a/net/psp/psp_sock.c
+++ b/net/psp/psp_sock.c
@@ -85,7 +85,7 @@ static int psp_dev_tx_key_add(struct psp_dev *psd, struct psp_assoc *pas,
void psp_dev_tx_key_del(struct psp_dev *psd, struct psp_assoc *pas)
{
- if (pas->tx.spi)
+ if (pas->tx.spi && !pas->tx_moved)
psd->ops->tx_key_del(psd, pas);
list_del(&pas->assocs_list);
}
@@ -99,6 +99,7 @@ static void psp_assoc_free(struct work_struct *work)
if (psd->ops)
psp_dev_tx_key_del(psd, pas);
mutex_unlock(&psd->lock);
+ psp_assoc_put(pas->prev);
psp_dev_put(psd);
kfree(pas);
}
@@ -129,30 +130,42 @@ void psp_sk_assoc_free(struct sock *sk)
psp_assoc_put(pas);
}
-int psp_sock_assoc_set_rx(struct sock *sk, struct psp_assoc *pas,
- struct psp_key_parsed *key,
- struct netlink_ext_ack *extack)
+static void psp_sock_rx_rekey(struct psp_assoc *pas, struct psp_assoc *prev)
{
- int err;
+ lockdep_assert_held(&pas->psd->lock);
+
+ pas->peer_tx = prev->peer_tx;
+ pas->upgrade_seq = prev->upgrade_seq;
+
+ /* steal refcount from sk->psp_assoc */
+ pas->prev = prev;
+
+ memcpy(&pas->tx, &prev->tx, sizeof(pas->tx));
+ memcpy(pas->drv_data, prev->drv_data, pas->psd->caps->assoc_drv_spc);
+ prev->tx_moved = true;
+
+ psp_assoc_put(prev->prev);
+ prev->prev = NULL;
+}
+
+void psp_sock_assoc_set_rx(struct sock *sk, struct psp_assoc *pas,
+ struct psp_key_parsed *key,
+ struct netlink_ext_ack *extack)
+{
+ struct psp_assoc *prev;
memcpy(&pas->rx, key, sizeof(*key));
lock_sock(sk);
- if (psp_sk_assoc(sk)) {
- NL_SET_ERR_MSG(extack, "Socket already has PSP state");
- err = -EBUSY;
- goto exit_unlock;
- }
+ prev = psp_sk_assoc(sk);
+ if (prev)
+ psp_sock_rx_rekey(pas, prev);
refcount_inc(&pas->refcnt);
rcu_assign_pointer(sk->psp_assoc, pas);
- err = 0;
-exit_unlock:
release_sock(sk);
-
- return err;
}
static int psp_sock_recv_queue_check(struct sock *sk, struct psp_assoc *pas)
--
2.47.3
Powered by blists - more mailing lists