netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marek Lindner <lindner_marek-LWAfsSFWpa4@public.gmane.org>
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org,
	Simon Wunderlich
	<siwu-MaAgPAbsBIVS8oHt8HbXEIQuADTiUCJX@public.gmane.org>
Subject: [PATCH 10/10] batman-adv: Fix range check for expected packets
Date: Sat, 26 Nov 2011 22:26:52 +0800	[thread overview]
Message-ID: <1322317612-7770-11-git-send-email-lindner_marek@yahoo.de> (raw)
In-Reply-To: <1322317612-7770-1-git-send-email-lindner_marek-LWAfsSFWpa4@public.gmane.org>

From: Simon Wunderlich <simon.wunderlich-Y4E02TeZ33kaBlGTGt4zH4SGEyLTKazZ@public.gmane.org>

The check for new packets in the future used a wrong binary operator,
which makes the check expression always true and accepting too many
packets.

Reported-by: Thomas Jarosch <thomas.jarosch-XXsH3GEs1jrby3iVrkZq2A@public.gmane.org>
Signed-off-by: Simon Wunderlich <siwu-MaAgPAbsBIVS8oHt8HbXEIQuADTiUCJX@public.gmane.org>
Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
---
 net/batman-adv/bitarray.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index 0be9ff3..9bc63b2 100644
--- a/net/batman-adv/bitarray.c
+++ b/net/batman-adv/bitarray.c
@@ -155,7 +155,7 @@ int bit_get_packet(void *priv, unsigned long *seq_bits,
 	/* sequence number is much newer, probably missed a lot of packets */
 
 	if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE)
-		|| (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
+		&& (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
 		bat_dbg(DBG_BATMAN, bat_priv,
 			"We missed a lot of packets (%i) !\n",
 			seq_num_diff - 1);
-- 
1.7.5.4

  parent reply	other threads:[~2011-11-26 14:26 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-26 14:26 pull request: batman-adv 2011-11-26 Marek Lindner
2011-11-26 14:26 ` [PATCH 01/10] batman-adv: update internal version number Marek Lindner
     [not found] ` <1322317612-7770-1-git-send-email-lindner_marek-LWAfsSFWpa4@public.gmane.org>
2011-11-26 14:26   ` [PATCH 02/10] batman-adv: tt_global_del_orig() has to print the correct message Marek Lindner
2011-11-26 14:26   ` [PATCH 03/10] batman-adv: Replace obsolete strict_strto<foo> with kstrto<foo> Marek Lindner
2011-11-26 14:26   ` [PATCH 04/10] batman-adv: refactoring gateway handling code Marek Lindner
2011-11-26 14:26   ` [PATCH 05/10] batman-adv: use orig_hash_find() instead of get_orig_node() in TT code Marek Lindner
2011-11-26 14:26   ` [PATCH 06/10] batman-adv: fixed hash functions type to uint32_t instead of int Marek Lindner
2011-11-26 14:26   ` [PATCH 08/10] batman-adv: linearise the tt_response skb only if needed Marek Lindner
2011-11-26 14:26   ` [PATCH 09/10] batman-adv: check for tt_reponse packet real length Marek Lindner
2011-11-26 14:26   ` Marek Lindner [this message]
2011-11-26 19:41   ` pull request: batman-adv 2011-11-26 David Miller
     [not found]     ` <20111126.144122.775553783672941660.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2011-12-02 17:12       ` Antonio Quartulli
     [not found]         ` <20111202171216.GA4561-E/2OGukznS5g9hUCZPvPmw@public.gmane.org>
2011-12-02 17:57           ` David Miller
     [not found]             ` <20111202.125725.896787381527077500.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2011-12-03  1:55               ` Antonio Quartulli
     [not found]                 ` <20111203015528.GB3148-E/2OGukznS5g9hUCZPvPmw@public.gmane.org>
2011-12-03  1:59                   ` David Miller
2011-11-26 14:26 ` [PATCH 07/10] batman-adv: directly write tt entries without buffering Marek Lindner

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=1322317612-7770-11-git-send-email-lindner_marek@yahoo.de \
    --to=lindner_marek-lwafssfwpa4@public.gmane.org \
    --cc=b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org \
    --cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
    --cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=siwu-MaAgPAbsBIVS8oHt8HbXEIQuADTiUCJX@public.gmane.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;
as well as URLs for NNTP newsgroup(s).