[net-next (TAKE 2) 1/4] firewire net: Accept IPv4 and ARP only.
From: YOSHIFUJI Hideaki <hidden>
Date: 2013-02-10 09:02:10
Subsystem:
firewire subsystem, the rest · Maintainers:
Takashi Sakamoto, Takashi Sakamoto, Linus Torvalds
Signed-off-by: YOSHIFUJI Hideaki <redacted> --- drivers/firewire/net.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 2b27bff..a748790 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c@@ -517,6 +517,14 @@ static int fwnet_finish_incoming_packet(struct net_device *net, int status; __be64 guid; + switch (ether_type) { + case ETH_P_ARP: + case ETH_P_IP: + break; + default: + goto err; + } + dev = netdev_priv(net); /* Write metadata, and then pass to the receive level */ skb->dev = net;
@@ -653,6 +661,7 @@ static int fwnet_finish_incoming_packet(struct net_device *net, return 0; no_peer: + err: net->stats.rx_errors++; net->stats.rx_dropped++;
@@ -1299,9 +1308,17 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net) * We might need to rebuild the header on tx failure. */ memcpy(&hdr_buf, skb->data, sizeof(hdr_buf)); - skb_pull(skb, sizeof(hdr_buf)); - proto = hdr_buf.h_proto; + + switch (proto) { + case htons(ETH_P_ARP): + case htons(ETH_P_IP): + break; + default: + goto fail; + } + + skb_pull(skb, sizeof(hdr_buf)); dg_size = skb->len; /*
--
1.7.9.5
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb