From patchwork Tue Oct 25 20:42:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 1320 Return-Path: Received: from contumacia.investici.org (contumacia.investici.org [178.255.144.35]) by open-mesh.org (Postfix) with ESMTPS id 0DABF6007B1 for ; Tue, 25 Oct 2011 22:43:51 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@autistici.org; dkim-adsp=pass Received: from [178.255.144.35] (contumacia [178.255.144.35]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 050F6E82C9; Tue, 25 Oct 2011 20:43:49 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 contumacia.investici.org 050F6E82C9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1319575430; bh=YXr+dDjnQ7i2pF42JB72LO2Sqshg5DXxRJFoeBixxqk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=nNc9zKcomuPnowOzGsIE2FTK+uNGcLtJfQ3/RDfU0yPferBtJAuNO9JO9XRu0Odaw PCM+8sEV8lRW37IpCpFFll0DHb6jD2iTu5tsoyvgHoKbmHxRuntiNDvo64bLTq2p/G YLe0C4L0cSC9cXbCbJ3hozPatJ0onJ7H4yDHtqIk= From: Antonio Quartulli To: stable@kernel.org Date: Tue, 25 Oct 2011 22:42:42 +0200 Message-Id: <1319575362-20828-2-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1319575362-20828-1-git-send-email-ordex@autistici.org> References: <1319575362-20828-1-git-send-email-ordex@autistici.org> Cc: b.a.t.m.a.n@lists.open-mesh.org, Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: correctly set the data field in the TT_REPONSE packet X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 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: Tue, 25 Oct 2011 20:43:51 -0000 In the TT_RESPONSE packet, the number of carried entries is not correctly set. This leads to a wrong interpretation of the packet payload on the receiver side causing random entries to be added to the global translation table. Therefore the latter gets always corrupted, triggering a table recovery all the time. Signed-off-by: Antonio Quartulli Signed-off-by: Marek Lindner --- David S. Miller already merged this patch as 9d8523931f7f5eb8900077f0da0fbe6b8ad0010b in his net-next tree net/batman-adv/translation-table.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f599db9..ef1acfd 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -999,7 +999,6 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, tt_response = (struct tt_query_packet *)skb_put(skb, tt_query_size + tt_len); tt_response->ttvn = ttvn; - tt_response->tt_data = htons(tt_tot); tt_change = (struct tt_change *)(skb->data + tt_query_size); tt_count = 0; @@ -1025,6 +1024,10 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, } rcu_read_unlock(); + /* store in the message the number of entries we have successfully + * copied */ + tt_response->tt_data = htons(tt_count); + out: return skb; }