From patchwork Sun Aug 1 21:20:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 326 Return-Path: Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.22]) by open-mesh.net (Postfix) with SMTP id 0196D15439F for ; Sun, 1 Aug 2010 23:20:43 +0200 (CEST) Received: (qmail invoked by alias); 01 Aug 2010 21:20:43 -0000 Received: from i59F6B41E.versanet.de (EHLO sven-desktop.lazhur.ath.cx) [89.246.180.30] by mail.gmx.net (mp014) with SMTP; 01 Aug 2010 23:20:43 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX18JonhqRsMJGp3lq65f7KhH9jKx/ybunvQTYG4dIb JmibY+Sixx/NcB From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 1 Aug 2010 23:20:12 +0200 Message-Id: <1280697613-32001-7-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1280697613-32001-1-git-send-email-sven.eckelmann@gmx.de> References: <1280697613-32001-1-git-send-email-sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 Subject: [B.A.T.M.A.N.] [PATCH 6/7] batman-adv: Provide full headers and packets as linear skb X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Aug 2010 21:20:44 -0000 We must ensure that all interesting data is linear and not paged out to access all information in a header or a full batman-adv related packet. Otherwise we may drop packets which have non-linear headers but which hold valid data. This doesn't affect non-linear skbs which have all headers in a linear head unless we must process the whole packet like in ogms or vis packets. Signed-off-by: Sven Eckelmann --- batman-adv/hard-interface.c | 2 +- batman-adv/routing.c | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c index fdabe4f..23a2595 100644 --- a/batman-adv/hard-interface.c +++ b/batman-adv/hard-interface.c @@ -490,7 +490,7 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, goto err_out; /* packet should hold at least type and version */ - if (unlikely(skb_headlen(skb) < 2)) + if (unlikely(!pskb_may_pull(skb, 2))) goto err_free; /* expect a valid ethernet header here. */ diff --git a/batman-adv/routing.c b/batman-adv/routing.c index 7667c55..8f3b6fb 100644 --- a/batman-adv/routing.c +++ b/batman-adv/routing.c @@ -756,7 +756,7 @@ int recv_bat_packet(struct sk_buff *skb, unsigned long flags; /* drop packet if it has not necessary minimum size */ - if (skb_headlen(skb) < sizeof(struct batman_packet)) + if (unlikely(!pskb_may_pull(skb, sizeof(struct batman_packet)))) return NET_RX_DROP; ethhdr = (struct ethhdr *)skb_mac_header(skb); @@ -773,6 +773,10 @@ int recv_bat_packet(struct sk_buff *skb, if (skb_cow(skb, 0) < 0) return NET_RX_DROP; + /* keep skb linear */ + if (skb_linearize(skb) < 0) + return NET_RX_DROP; + ethhdr = (struct ethhdr *)skb_mac_header(skb); spin_lock_irqsave(&orig_hash_lock, flags); @@ -926,11 +930,11 @@ int recv_icmp_packet(struct sk_buff *skb) /** * we truncate all incoming icmp packets if they don't match our size */ - if (skb_headlen(skb) >= sizeof(struct icmp_packet_rr)) + if (skb->len >= sizeof(struct icmp_packet_rr)) hdr_size = sizeof(struct icmp_packet_rr); /* drop packet if it has not necessary minimum size */ - if (skb_headlen(skb) < hdr_size) + if (unlikely(!pskb_may_pull(skb, hdr_size))) return NET_RX_DROP; ethhdr = (struct ethhdr *)skb_mac_header(skb); @@ -1099,7 +1103,7 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size) struct ethhdr *ethhdr; /* drop packet if it has not necessary minimum size */ - if (skb_headlen(skb) < hdr_size) + if (unlikely(!pskb_may_pull(skb, hdr_size))) return -1; ethhdr = (struct ethhdr *) skb_mac_header(skb); @@ -1259,7 +1263,7 @@ int recv_bcast_packet(struct sk_buff *skb) unsigned long flags; /* drop packet if it has not necessary minimum size */ - if (skb_headlen(skb) < hdr_size) + if (unlikely(!pskb_may_pull(skb, hdr_size))) return NET_RX_DROP; ethhdr = (struct ethhdr *)skb_mac_header(skb); @@ -1332,7 +1336,11 @@ int recv_vis_packet(struct sk_buff *skb) struct bat_priv *bat_priv; int hdr_size = sizeof(struct vis_packet); - if (skb_headlen(skb) < hdr_size) + /* keep skb linear */ + if (skb_linearize(skb) < 0) + return NET_RX_DROP; + + if (unlikely(!pskb_may_pull(skb, hdr_size))) return NET_RX_DROP; vis_packet = (struct vis_packet *) skb->data; @@ -1354,13 +1362,11 @@ int recv_vis_packet(struct sk_buff *skb) switch (vis_packet->vis_type) { case VIS_TYPE_SERVER_SYNC: - /* TODO: handle fragmented skbs properly */ receive_server_sync_packet(bat_priv, vis_packet, skb_headlen(skb)); break; case VIS_TYPE_CLIENT_UPDATE: - /* TODO: handle fragmented skbs properly */ receive_client_update_packet(bat_priv, vis_packet, skb_headlen(skb)); break;