Skip to content

Commit

Permalink
batman-adv: Return reason for failure in batadv_check_unicast_packet()
Browse files Browse the repository at this point in the history
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@hundeboll.net>
Acked-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
  • Loading branch information
Martin Hundebøll authored and Antonio Quartulli committed Mar 13, 2013
1 parent 736292c commit f86ce0a
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions net/batman-adv/routing.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit f86ce0a

Please sign in to comment.