From patchwork Fri Oct 15 15:43:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 508 Return-Path: Received: from nm3-vm0.bullet.mail.ukl.yahoo.com (nm3-vm0.bullet.mail.ukl.yahoo.com [217.146.183.228]) by open-mesh.org (Postfix) with SMTP id 0C9F81544BE for ; Fri, 15 Oct 2010 17:46:03 +0200 (CEST) Received: from [217.146.183.215] by nm3.bullet.mail.ukl.yahoo.com with NNFMP; 15 Oct 2010 15:46:02 -0000 Received: from [217.146.183.74] by tm8.bullet.mail.ukl.yahoo.com with NNFMP; 15 Oct 2010 15:45:56 -0000 Received: from [127.0.0.1] by omp1035.mail.ukl.yahoo.com with NNFMP; 15 Oct 2010 15:45:55 -0000 X-Yahoo-Newman-Id: 983202.62742.bm@omp1035.mail.ukl.yahoo.com Received: (qmail 592 invoked from network); 15 Oct 2010 15:45:55 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.de; h=DKIM-Signature:Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=koKQiyNjm6T9IyFC/IiCyWKeF2jdwiuk7ocKK+kjeUP2Ub8gCcsmoF+CVrO2hvzbwmqj4tH/2Rnev4NAIWAknxzbf1U38KNROdEiqWR1LWeWX54HtX3EXFWwPpimfsGcanUG4iTi2jeVJbKivguSVoECjvCo/EWDiBfzP4i/XSs= ; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1287157555; bh=fyWGTzGsoG/YeNe7FpEsyHUkx+oBnub1gsly1BVYGgg=; h=Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=GCK+hnJRd2plqVTidlX0QJNZu5dCUklJOT413PiAW6/EMSyiZQ3oeJLjs3LL+Ay6kMAdlMA8v1tjznkHvrpOefQBZRtahugVGabSoWYHkDoGMblgjNcpHdv47Xrk5yd2YISNlewsvqopaDltNsFPieoGYvX/7xXNcV7iwzTZEnQ= Received: from localhost (lindner_marek@78.225.40.81 with plain) by smtp130.mail.ukl.yahoo.com with SMTP; 15 Oct 2010 15:45:55 +0000 GMT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: 4rqY3pgVM1njI93KYf0ocluVbUB5yTqrgi0rHLLopeB8ENf 24Ju8Vm9IagZGmdRjDLEoSdXogeum8p9pUGo3h70.SIT2n0Ikd5Y10qruMC. LjeK3QDgl2AHIZHPVm8MLUCbI0SDB_6ybN_JFj5BSg446O_SqwJYAqgcG_QQ eVVmzLyRdCxFBqcO49mas5cmPQy6b12Nnhp5jzsVY.zot6o61e7pHl0hGXpM 8KPG5qMh6ma_kPVJ_nL2n8HOHobb1SFn.GsNPpWdi X-Yahoo-Newman-Property: ymail-3 From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 15 Oct 2010 17:43:36 +0200 Message-Id: <1287157417-15369-2-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1287157417-15369-1-git-send-email-lindner_marek@yahoo.de> References: <1287157417-15369-1-git-send-email-lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 2/3] batman-adv: fix crash when new OGM is generated 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: Fri, 15 Oct 2010 15:46:03 -0000 If aggregation is not enabled the local translation table can grow much bigger and expects to fill a full ethernet packet. Reported-by: Sam Yeung Signed-off-by: Marek Lindner --- batman-adv/aggregation.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/batman-adv/aggregation.c b/batman-adv/aggregation.c index 46b9c2b..16b268e 100644 --- a/batman-adv/aggregation.c +++ b/batman-adv/aggregation.c @@ -123,8 +123,14 @@ static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, return; } - forw_packet_aggr->skb = dev_alloc_skb(MAX_AGGREGATION_BYTES + - sizeof(struct ethhdr)); + if ((atomic_read(&bat_priv->aggregation_enabled)) && + (packet_len < MAX_AGGREGATION_BYTES)) + forw_packet_aggr->skb = dev_alloc_skb(MAX_AGGREGATION_BYTES + + sizeof(struct ethhdr)); + else + forw_packet_aggr->skb = dev_alloc_skb(packet_len + + sizeof(struct ethhdr)); + if (!forw_packet_aggr->skb) { if (!own_packet) atomic_inc(&bat_priv->batman_queue_left);