From: Antonio Quartulli <ordex@autistici.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Antonio Quartulli <ordex@autistici.org>
Subject: [PATCH 01/16] batman-adv: use check_unicast_packet() in recv_roam_adv()
Date: Mon, 29 Oct 2012 09:58:02 +0100 [thread overview]
Message-ID: <1351501097-1289-2-git-send-email-ordex@autistici.org> (raw)
In-Reply-To: <1351501097-1289-1-git-send-email-ordex@autistici.org>
To avoid code duplication and to simplify further changes,
check_unicast_packet() is now used in recv_roam_adv() to check for not
well formed packets and so discard them.
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
net/batman-adv/routing.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 376b4cc..8bdafc8 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -687,21 +687,8 @@ int batadv_recv_roam_adv(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
struct batadv_roam_adv_packet *roam_adv_packet;
struct batadv_orig_node *orig_node;
- struct ethhdr *ethhdr;
- /* drop packet if it has not necessary minimum size */
- if (unlikely(!pskb_may_pull(skb,
- sizeof(struct batadv_roam_adv_packet))))
- goto out;
-
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- /* packet with unicast indication but broadcast recipient */
- if (is_broadcast_ether_addr(ethhdr->h_dest))
- goto out;
-
- /* packet with broadcast sender address */
- if (is_broadcast_ether_addr(ethhdr->h_source))
+ if (batadv_check_unicast_packet(skb, sizeof(*roam_adv_packet)) < 0)
goto out;
batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_RX);
--
1.7.12.4
next prev parent reply other threads:[~2012-10-29 8:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-29 8:58 pull request: batman-adv 202-10-29 Antonio Quartulli
2012-10-29 8:58 ` Antonio Quartulli [this message]
[not found] ` <1351501097-1289-1-git-send-email-ordex-GaUfNO9RBHfsrOwW+9ziJQ@public.gmane.org>
2012-10-29 8:58 ` [PATCH 02/16] batman-adv: split hard_iface struct for each routing protocol Antonio Quartulli
2012-10-29 8:58 ` [PATCH 03/16] batman-adv: Remove unused define BAT_ATTR_HIF_UINT Antonio Quartulli
2012-10-29 8:58 ` [PATCH 04/16] batman-adv: consolidate duplicated primary_if checking code Antonio Quartulli
2012-10-29 8:58 ` [PATCH 05/16] batman-adv: return proper value in case of hash_add failure Antonio Quartulli
2012-10-29 8:58 ` [PATCH 06/16] batman-adv: Set special lockdep classes to avoid lockdep warning Antonio Quartulli
2012-10-29 8:58 ` [PATCH 07/16] batman-adv: Remove extra check in batadv_bit_get_packet Antonio Quartulli
2012-10-29 8:58 ` [PATCH 08/16] batman-adv: Check return value of try_module_get Antonio Quartulli
2012-10-29 8:58 ` [PATCH 09/16] batman-adv: Only increase refcounter once for alternate router Antonio Quartulli
2012-10-29 8:58 ` [PATCH 10/16] batman-adv: don't allow ECTP traffic on batman-adv Antonio Quartulli
2012-10-29 8:58 ` [PATCH 11/16] batman-adv: properly store the roaming time Antonio Quartulli
2012-10-29 8:58 ` [PATCH 12/16] batman-adv: print packets re-routing on DBG_TT and ratelimit it Antonio Quartulli
2012-10-29 8:58 ` [PATCH 13/16] batman-adv: check for more space before accessing the skb Antonio Quartulli
2012-10-29 8:58 ` [PATCH 14/16] batman-adv: properly convert flag into a boolean value Antonio Quartulli
2012-10-29 8:58 ` [PATCH 15/16] batman-adv: pass the WIFI flag from the local to global entry Antonio Quartulli
2012-10-29 8:58 ` [PATCH 16/16] batman-adv: add kernel-doc for enum batadv_dbg_level Antonio Quartulli
2012-10-31 17:53 ` pull request: batman-adv 202-10-29 David Miller
-- strict thread matches above, loose matches on Subject: below --
2012-10-28 11:17 pull request: batman-adv 2012-10-28 Antonio Quartulli
2012-10-28 11:17 ` [PATCH 01/16] batman-adv: use check_unicast_packet() in recv_roam_adv() Antonio Quartulli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351501097-1289-2-git-send-email-ordex@autistici.org \
--to=ordex@autistici.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox