drop_monitor: Better sanitize notified packets
Subsystems (4)
cover drop_monitor: Better sanitize notified packets
From: Ido Schimmel <[email protected]>
When working in 'packet' mode, drop monitor generates a notification with a potentially truncated payload of the dropped packet. The payload is copied from the MAC header, but I forgot to check that the MAC header was set, so do it now.
Patch #1 sets the offsets to the various protocol layers in netdevsim, so that it will continue to work after the MAC header check is added to drop monitor in patch #2.
Ido Schimmel (2):
netdevsim: Set offsets to various protocol layers
drop_monitor: Better sanitize notified packets
drivers/net/netdevsim/dev.c | 3 +++ net/core/drop_monitor.c | 6 ++++++ 2 files changed, 9 insertions(+)
Signature · 1 line
2.21.0
PATCH 1/2 netdevsim: Set offsets to various protocol layers
From: Ido Schimmel <[email protected]>
The driver periodically generates "trapped" UDP packets that it then passes on to devlink. Set the offsets to the various protocol layers.
This is a prerequisite to the next patch, where drop monitor is taught to check that the offset to the MAC header was set.
--- drivers/net/netdevsim/dev.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/netdevsim/dev.c +3 -0
@@ -374,12 +374,14 @@ static struct sk_buff *nsim_dev_trap_skb_build(void)return NULL ; tot_len =sizeof (struct iphdr ) +sizeof (struct udphdr ) + data_len; +skb_reset_mac_header (skb); eth =skb_put (skb,sizeof (struct ethhdr ));eth_random_addr (eth->h_dest);eth_random_addr (eth->h_source); eth->h_proto =htons (ETH_P_IP ); skb->protocol =htons (ETH_P_IP ); +skb_set_network_header (skb, skb->len); iph =skb_put (skb,sizeof (struct iphdr )); iph->protocol =IPPROTO_UDP ; iph->saddr =in_aton ("192.0.2.1" );
@@ -392,6 +394,7 @@ static struct sk_buff *nsim_dev_trap_skb_build(void) iph->check =0 ; iph->check =ip_fast_csum ((unsigned char *)iph, iph->ihl); +skb_set_transport_header (skb, skb->len); udph =skb_put_zero (skb,sizeof (struct udphdr ) + data_len);get_random_bytes (&udph->source,sizeof (u16));get_random_bytes (&udph->dest,sizeof (u16));
Signature · 1 line
2.21.0
PATCH 2/2 drop_monitor: Better sanitize notified packets
In reply to Ido SchimmelFrom: Ido Schimmel <[email protected]>
When working in 'packet' mode, drop monitor generates a notification with a potentially truncated payload of the dropped packet. The payload is copied from the MAC header, but I forgot to check that the MAC header was set, so do it now.
--- net/core/drop_monitor.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/core/drop_monitor.c +6 -0
@@ -487,6 +487,9 @@ static void net_dm_packet_trace_kfree_skb_hit(void *ignore,struct sk_buff *nskb;unsigned long flags; +if (!skb_mac_header_was_set (skb)) +return ; + nskb =skb_clone (skb,GFP_ATOMIC );if (!nskb)return ;
@@ -900,6 +903,9 @@ net_dm_hw_packet_probe(struct sk_buff *skb,struct sk_buff *nskb;unsigned long flags; +if (!skb_mac_header_was_set (skb)) +return ; + nskb =skb_clone (skb,GFP_ATOMIC );if (!nskb)return ;
Signature · 1 line
2.21.0
David Miller
maintainerFrom: Ido Schimmel <[email protected]>
Date: Sun, 15 Sep 2019 09:46:34 +0300
Quoted 10 lines
From: Ido Schimmel <[email protected]>
When working in 'packet' mode, drop monitor generates a notification with a potentially truncated payload of the dropped packet. The payload is copied from the MAC header, but I forgot to check that the MAC header was set, so do it now.
Patch #1 sets the offsets to the various protocol layers in netdevsim, so that it will continue to work after the MAC header check is added to drop monitor in patch #2.
Series applied.