diff --git a/include/net/dst_metadata.h b/include/net/dst_metadata.h
index f45d1e3163f0..73755bce2df0 100644
--- a/include/net/dst_metadata.h
+++ b/include/net/dst_metadata.h
@@ -13,6 +13,7 @@ enum metadata_type {
METADATA_HW_PORT_MUX,
METADATA_MACSEC,
METADATA_XFRM,
+ METADATA_PSP,
};
struct hw_port_info {@@ -30,6 +31,14 @@ struct xfrm_md_info {
struct dst_entry *dst_orig;
};
+/**
+ * struct psp_md_info - PSP association to encrypt a packet with
+ * @pas: association, the metadata_dst holds a reference on it
+ */
+struct psp_md_info {
+ struct psp_assoc *pas;
+};
+
struct metadata_dst {
struct dst_entry dst;
enum metadata_type type;@@ -38,6 +47,7 @@ struct metadata_dst {
struct hw_port_info port_info;
struct macsec_info macsec_info;
struct xfrm_md_info xfrm_info;
+ struct psp_md_info psp_info;
} u;
};
@@ -51,6 +61,13 @@ static inline struct metadata_dst *skb_metadata_dst(const struct sk_buff *skb)
return NULL;
}
+static inline bool skb_psp_md(const struct sk_buff *skb)
+{
+ struct metadata_dst *md_dst = skb_metadata_dst(skb);
+
+ return md_dst && md_dst->type == METADATA_PSP;
+}
+
static inline struct ip_tunnel_info *
skb_tunnel_info(const struct sk_buff *skb)
{@@ -125,6 +142,8 @@ static inline int skb_metadata_dst_cmp(const struct sk_buff *skb_a,
case METADATA_XFRM:
return memcmp(&a->u.xfrm_info, &b->u.xfrm_info,
sizeof(a->u.xfrm_info));
+ case METADATA_PSP:
+ return a->u.psp_info.pas != b->u.psp_info.pas;
default:
return 1;
}
diff --git a/include/net/psp/functions.h b/include/net/psp/functions.h
index d0789a9694bc..796e5f36f249 100644
--- a/include/net/psp/functions.h
+++ b/include/net/psp/functions.h
@@ -6,6 +6,8 @@
#include <linux/skbuff.h>
#include <linux/rcupdate.h>
#include <linux/udp.h>
+#include <net/dst_metadata.h>
+#include <net/gso.h>
#include <net/sock.h>
#include <net/tcp.h>
#include <net/psp/types.h>
@@ -22,6 +24,7 @@ bool psp_dev_encapsulate(struct net *net, struct sk_buff *skb, __be32 spi,
int psp_dev_rcv(struct sk_buff *skb, u16 dev_id, u8 generation, bool strip_icv);
/* Kernel-facing API */
+#if IS_ENABLED(CONFIG_INET_PSP)
void psp_assoc_put(struct psp_assoc *pas);
struct psp_assoc *psp_assoc_get_by_id(struct net *net, u32 id);
@@ -34,7 +37,6 @@ static inline bool psp_assoc_is_tx(const struct psp_assoc *pas)
return pas->tx.spi != 0;
}
-#if IS_ENABLED(CONFIG_INET_PSP)
unsigned int psp_key_size(u32 version);
void psp_sk_assoc_free(struct sock *sk);
void psp_twsk_init(struct inet_timewait_sock *tw, const struct sock *sk);
@@ -144,14 +146,78 @@ static inline struct psp_assoc *psp_sk_get_assoc_rcu(const struct sock *sk)
return pas;
}
+static inline struct psp_assoc *psp_skb_md_assoc(const struct sk_buff *skb)
+{
+ struct metadata_dst *md_dst = skb_metadata_dst(skb);
+
+ if (md_dst && md_dst->type == METADATA_PSP)
+ return md_dst->u.psp_info.pas;
+
+ return NULL;
+}
+
static inline struct psp_assoc *psp_skb_get_assoc_rcu(struct sk_buff *skb)
{
+ struct psp_assoc *pas;
+
+ pas = psp_skb_md_assoc(skb);
+ if (pas)
+ return pas;
+
if (!skb->decrypted || !skb->sk)
return NULL;
return psp_sk_get_assoc_rcu(skb->sk);
}
+/**
+ * psp_xmit_md() - validate psp association attached as a metadata dst
+ * @skb: packet about to be queued for transmission
+ * @dev: device it is queued on
+ *
+ * If the skb has a psp association attached as metadata dst, this indicates
+ * intent to transmit encrypted, which will only happen when transmit on
+ * the main netdev of its psp device.
+ *
+ * Also check that the packet will still fit @dev's MTU once the device has
+ * added the PSP encapsulation. Sockets leave room for it (psp_sk_overhead()),
+ * whoever attached the association may not have.
+ *
+ * returns:
+ * 0 if @skb carries no psp association
+ * 1 if it does and the dst must be kept for the driver
+ * -EINVAL if the packet must be dropped, @dev isn't of its psp device
+ * -EMSGSIZE if the packet must be dropped, too big once encapsulated
+ */
+static inline int psp_xmit_md(const struct sk_buff *skb,
+ const struct net_device *dev)
+{
+ unsigned int psp_encap = sizeof(struct udphdr) + PSP_HDR_SIZE +
+ PSP_TRL_SIZE;
+ struct psp_assoc *pas = psp_skb_md_assoc(skb);
+ unsigned int mtu;
+
+ if (likely(!pas))
+ return 0;
+
+ if (rcu_access_pointer(dev->psp_dev) != pas->psd ||
+ dev != pas->psd->main_netdev)
+ return -EINVAL;
+
+ mtu = READ_ONCE(dev->mtu);
+ if (mtu <= psp_encap)
+ return -EMSGSIZE;
+ mtu -= psp_encap;
+ if (skb_is_gso(skb)) {
+ if (!skb_gso_validate_network_len(skb, mtu))
+ return -EMSGSIZE;
+ } else if (skb->len - skb_network_offset(skb) > mtu) {
+ return -EMSGSIZE;
+ }
+
+ return 1;
+}
+
static inline unsigned int psp_sk_overhead(const struct sock *sk)
{
int psp_encap = sizeof(struct udphdr) + PSP_HDR_SIZE + PSP_TRL_SIZE;@@ -160,6 +226,19 @@ static inline unsigned int psp_sk_overhead(const struct sock *sk)
return pas && pas->tx.spi ? psp_encap : 0;
}
#else
+static inline void psp_assoc_put(struct psp_assoc *pas) { }
+
+static inline struct psp_assoc *psp_assoc_get_by_id(struct net *net, u32 id)
+{
+ return NULL;
+}
+
+static inline int psp_xmit_md(const struct sk_buff *skb,
+ const struct net_device *dev)
+{
+ return 0;
+}
+
static inline void psp_sk_assoc_free(struct sock *sk) { }
static inline void
psp_twsk_init(struct inet_timewait_sock *tw, const struct sock *sk) { }diff --git a/net/core/dev.c b/net/core/dev.c
index 9665f3b2f5cb..2cca5f0d302f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -111,6 +111,7 @@
#include <net/pkt_cls.h>
#include <net/checksum.h>
#include <net/xfrm.h>
+#include <net/psp/functions.h>
#include <net/tcx.h>
#include <linux/highmem.h>
#include <linux/init.h>
@@ -4134,9 +4135,13 @@ int skb_csum_hwoffload_help(struct sk_buff *skb,
}
EXPORT_SYMBOL(skb_csum_hwoffload_help);
-/* Checks if this SKB belongs to an HW offloaded socket
- * and whether any SW fallbacks are required based on dev.
- * Check decrypted mark in case skb_orphan() cleared socket.
+/* Validate an skb for device encryption offload. If the skb belongs to an HW
+ * offloaded socket, apply the socket's callback. Otherwise, an skb which
+ * carries a PSP association is checked again against dev: the PSP device may
+ * have been unregistered while the skb was queued. An skb marked decrypted
+ * (to be encrypted by the device) without either is dropped rather than sent
+ * in clear text. The mark survives losing the socket to skb_orphan(), or the
+ * PSP metadata dst to routing.
*/
static struct sk_buff *sk_validate_xmit_skb(struct sk_buff *skb,
struct net_device *dev)
@@ -4156,6 +4161,15 @@ static struct sk_buff *sk_validate_xmit_skb(struct sk_buff *skb,
if (sk_validate) {
skb = sk_validate(sk, dev, skb);
+ } else if (unlikely(skb_psp_md(skb))) {
+ int psp = psp_xmit_md(skb, dev);
+
+ if (psp <= 0) {
+ kfree_skb_reason(skb, psp == -EMSGSIZE ?
+ SKB_DROP_REASON_PKT_TOO_BIG :
+ SKB_DROP_REASON_PSP_OUTPUT);
+ skb = NULL;
+ }
} else if (unlikely(skb_is_decrypted(skb))) {
pr_warn_ratelimited("unencrypted skb with no associated socket - dropping\n");
kfree_skb(skb);@@ -4981,7 +4995,7 @@ int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)
struct net_device *dev = skb->dev;
struct netdev_queue *txq = NULL;
enum skb_drop_reason reason;
- int cpu, rc = -ENOMEM;
+ int cpu, psp, rc = -ENOMEM;
bool again = false;
struct Qdisc *q;
@@ -5030,10 +5044,19 @@ int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)
txq = netdev_tx_queue_mapping(dev, skb);
}
#endif
+ psp = psp_xmit_md(skb, dev);
+ if (unlikely(psp < 0)) {
+ reason = psp == -EMSGSIZE ? SKB_DROP_REASON_PKT_TOO_BIG :
+ SKB_DROP_REASON_PSP_OUTPUT;
+ rc = psp;
+ goto drop;
+ }
+
/* If device/qdisc don't need skb->dst, release it right now while
- * its hot in this cpu cache.
+ * its hot in this cpu cache. A PSP metadata dst carries the packet's
+ * association to the driver, so keep it in that case.
*/
- if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
+ if ((dev->priv_flags & IFF_XMIT_DST_RELEASE) && likely(!psp))
skb_dst_drop(skb);
else
skb_dst_force(skb);diff --git a/net/core/dst.c b/net/core/dst.c
index 092861133023..38ad136cb46f 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -26,6 +26,7 @@
#include <net/dst.h>
#include <net/dst_metadata.h>
+#include <net/psp/functions.h>
int dst_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb)
{@@ -313,6 +314,8 @@ void metadata_dst_free(struct metadata_dst *md_dst)
#endif
if (md_dst->type == METADATA_XFRM)
dst_release(md_dst->u.xfrm_info.dst_orig);
+ if (md_dst->type == METADATA_PSP)
+ psp_assoc_put(md_dst->u.psp_info.pas);
kfree(md_dst);
}
EXPORT_SYMBOL_GPL(metadata_dst_free);
@@ -349,6 +352,8 @@ void metadata_dst_free_percpu(struct metadata_dst __percpu *md_dst)
#endif
if (one_md_dst->type == METADATA_XFRM)
dst_release(one_md_dst->u.xfrm_info.dst_orig);
+ if (one_md_dst->type == METADATA_PSP)
+ psp_assoc_put(one_md_dst->u.psp_info.pas);
}
free_percpu(md_dst);
}
--
2.53.0-Meta