[linux-next] LinuxNextTracking branch, master, updated. next-20130315

batman at open-mesh.org batman at open-mesh.org
Sat Mar 16 00:17:45 CET 2013


The following commit has been merged in the master branch:
commit f86ce0ad107bc0e33ead8ba2498fc22dfb747479
Author: Martin Hundebøll <martin at hundeboll.net>
Date:   Mon Jan 14 00:20:32 2013 +0100

    batman-adv: Return reason for failure in batadv_check_unicast_packet()
    
    batadv_check_unicast_packet() is changed to return a value based on the
    reason to drop the packet, which will be useful information for
    future users of batadv_check_unicast_packet().
    
    Signed-off-by: Martin Hundebøll <martin at hundeboll.net>
    Acked-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 5ee21ce..322c97a 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -548,27 +548,37 @@ batadv_find_ifalter_router(struct batadv_orig_node *primary_orig,
 	return router;
 }
 
+/**
+ * batadv_check_unicast_packet - Check for malformed unicast packets
+ * @skb: packet to check
+ * @hdr_size: size of header to pull
+ *
+ * Check for short header and bad addresses in given packet. Returns negative
+ * value when check fails and 0 otherwise. The negative value depends on the
+ * reason: -ENODATA for bad header, -EBADR for broadcast destination or source,
+ * and -EREMOTE for non-local (other host) destination.
+ */
 static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size)
 {
 	struct ethhdr *ethhdr;
 
 	/* drop packet if it has not necessary minimum size */
 	if (unlikely(!pskb_may_pull(skb, hdr_size)))
-		return -1;
+		return -ENODATA;
 
 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
 
 	/* packet with unicast indication but broadcast recipient */
 	if (is_broadcast_ether_addr(ethhdr->h_dest))
-		return -1;
+		return -EBADR;
 
 	/* packet with broadcast sender address */
 	if (is_broadcast_ether_addr(ethhdr->h_source))
-		return -1;
+		return -EBADR;
 
 	/* not for me */
 	if (!batadv_is_my_mac(ethhdr->h_dest))
-		return -1;
+		return -EREMOTE;
 
 	return 0;
 }

-- 
LinuxNextTracking


More information about the linux-merge mailing list