* [PATCH net-next] vrf: plug skb leaks
@ 2015-08-19 3:12 Nikolay Aleksandrov
2015-08-19 17:13 ` David Ahern
2015-08-20 19:59 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Nikolay Aleksandrov @ 2015-08-19 3:12 UTC (permalink / raw)
To: netdev; +Cc: dsa, shm, davem, Nikolay Aleksandrov
From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Currently whenever a packet different from ETH_P_IP is sent through the
VRF device it is leaked so plug the leaks and properly drop these
packets.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
---
drivers/net/vrf.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index ed208317cbb5..4aa06450fafa 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -97,6 +97,12 @@ static bool is_ip_rx_frame(struct sk_buff *skb)
return false;
}
+static void vrf_tx_error(struct net_device *vrf_dev, struct sk_buff *skb)
+{
+ vrf_dev->stats.tx_errors++;
+ kfree_skb(skb);
+}
+
/* note: already called with rcu_read_lock */
static rx_handler_result_t vrf_handle_frame(struct sk_buff **pskb)
{
@@ -149,7 +155,8 @@ static struct rtnl_link_stats64 *vrf_get_stats64(struct net_device *dev,
static netdev_tx_t vrf_process_v6_outbound(struct sk_buff *skb,
struct net_device *dev)
{
- return 0;
+ vrf_tx_error(dev, skb);
+ return NET_XMIT_DROP;
}
static int vrf_send_v4_prep(struct sk_buff *skb, struct flowi4 *fl4,
@@ -206,8 +213,7 @@ static netdev_tx_t vrf_process_v4_outbound(struct sk_buff *skb,
out:
return ret;
err:
- vrf_dev->stats.tx_errors++;
- kfree_skb(skb);
+ vrf_tx_error(vrf_dev, skb);
goto out;
}
@@ -219,6 +225,7 @@ static netdev_tx_t is_ip_tx_frame(struct sk_buff *skb, struct net_device *dev)
case htons(ETH_P_IPV6):
return vrf_process_v6_outbound(skb, dev);
default:
+ vrf_tx_error(dev, skb);
return NET_XMIT_DROP;
}
}
--
2.4.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH net-next] vrf: plug skb leaks
2015-08-19 3:12 [PATCH net-next] vrf: plug skb leaks Nikolay Aleksandrov
@ 2015-08-19 17:13 ` David Ahern
[not found] ` <CABQ03vHefGG1yM6CPM2Xosa_MgxfgO0YK9EeqmHAQLZUWsh8Uw@mail.gmail.com>
2015-08-20 19:59 ` David Miller
1 sibling, 1 reply; 5+ messages in thread
From: David Ahern @ 2015-08-19 17:13 UTC (permalink / raw)
To: Nikolay Aleksandrov, netdev; +Cc: shm, davem, Nikolay Aleksandrov
Hi Nikolay:
On 8/18/15 8:12 PM, Nikolay Aleksandrov wrote:
> diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
> index ed208317cbb5..4aa06450fafa 100644
> --- a/drivers/net/vrf.c
> +++ b/drivers/net/vrf.c
> @@ -97,6 +97,12 @@ static bool is_ip_rx_frame(struct sk_buff *skb)
> return false;
> }
>
> +static void vrf_tx_error(struct net_device *vrf_dev, struct sk_buff *skb)
> +{
> + vrf_dev->stats.tx_errors++;
> + kfree_skb(skb);
> +}
> +
> /* note: already called with rcu_read_lock */
> static rx_handler_result_t vrf_handle_frame(struct sk_buff **pskb)
> {
> @@ -149,7 +155,8 @@ static struct rtnl_link_stats64 *vrf_get_stats64(struct net_device *dev,
> static netdev_tx_t vrf_process_v6_outbound(struct sk_buff *skb,
> struct net_device *dev)
> {
> - return 0;
> + vrf_tx_error(dev, skb);
> + return NET_XMIT_DROP;
> }
>
> static int vrf_send_v4_prep(struct sk_buff *skb, struct flowi4 *fl4,
> @@ -206,8 +213,7 @@ static netdev_tx_t vrf_process_v4_outbound(struct sk_buff *skb,
> out:
> return ret;
> err:
> - vrf_dev->stats.tx_errors++;
> - kfree_skb(skb);
> + vrf_tx_error(vrf_dev, skb);
> goto out;
> }
>
> @@ -219,6 +225,7 @@ static netdev_tx_t is_ip_tx_frame(struct sk_buff *skb, struct net_device *dev)
> case htons(ETH_P_IPV6):
> return vrf_process_v6_outbound(skb, dev);
> default:
> + vrf_tx_error(dev, skb);
> return NET_XMIT_DROP;
> }
> }
>
Would be simpler to do the vrf_tx_error at the end of is_ip_tx_frame()
if ret == NET_XMIT_DROP.
David
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net-next] vrf: plug skb leaks
2015-08-19 3:12 [PATCH net-next] vrf: plug skb leaks Nikolay Aleksandrov
2015-08-19 17:13 ` David Ahern
@ 2015-08-20 19:59 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2015-08-20 19:59 UTC (permalink / raw)
To: razor; +Cc: netdev, dsa, shm, nikolay
From: Nikolay Aleksandrov <razor@blackwall.org>
Date: Wed, 19 Aug 2015 06:12:29 +0300
> From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
>
> Currently whenever a packet different from ETH_P_IP is sent through the
> VRF device it is leaked so plug the leaks and properly drop these
> packets.
>
> Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-08-20 20:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-19 3:12 [PATCH net-next] vrf: plug skb leaks Nikolay Aleksandrov
2015-08-19 17:13 ` David Ahern
[not found] ` <CABQ03vHefGG1yM6CPM2Xosa_MgxfgO0YK9EeqmHAQLZUWsh8Uw@mail.gmail.com>
2015-08-19 20:17 ` Nikolay Aleksandrov
2015-08-19 21:00 ` David Ahern
2015-08-20 19:59 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).