summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2013-03-25 08:25:38 +0000
committerDavid S. Miller <davem@davemloft.net>2013-03-26 12:32:13 -0400
commit18406d7e42a67d7b3a3b3ed17be6626a51d8c715 (patch)
tree69c20a5c860b6970383abc66b07fe6788e5a03d6 /drivers/firewire
parentb8092861efd827deb8d84292674704ee8bf41b04 (diff)
downloadlinux-18406d7e42a67d7b3a3b3ed17be6626a51d8c715.tar.bz2
firewire net: Accept IPv4 and ARP only.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/net.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index c1898adeb900..d438c5be8c21 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++;
@@ -1340,9 +1349,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;
/*