Logic bug in B.A.T.M.A.N. advanced driver
Subsystems (2)
Hi Marek,
Consider this code from "net/batman-adv/bitarray.c":
int bit_get_packet(void *priv, unsigned long *seq_bits,
int32_t seq_num_diff, int set_mark)
{
...
if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE)
|| (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
bat_dbg(DBG_BATMAN, bat_priv,
"We missed a lot of packets (%i) !\n",
seq_num_diff - 1);
bit_reset_window(seq_bits);
if (set_mark)
bit_mark(seq_bits, 0);
return 1;
}-----------------------------------
The defines from "main.h":
#define TQ_LOCAL_WINDOW_SIZE 64
#define EXPECTED_SEQNO_RANGE 65536
So that if() statement will translate to:
-----------------------------------
if ((seq_num_diff >= 64)
|| (seq_num_diff < 65536)) {-----------------------------------
and this will always evaluate to true.
Detected by "cppcheck":
"[net/batman-adv/bitarray.c:157]: (warning) Mutual exclusion over || always evaluates to true. Did you intend to use && instead?"
Cheers,
Thomas
PATCH 1/1 batman-adv: Fix range check for expected packets
In reply to a message not in the archiveThe check for new packets in the future used a wrong binary operator, which makes the check expression always true and accepting too many packets.
--- bitarray.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
bitarray.c +1 -1
@@ -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 );
Signature · 1 line
1.7.7
Marek Lindner
AppliedRe: [PATCH] batman-adv: Fix range check for expected packets
In reply to a message not in the archiveQuoted 3 lines · On Sunday, October 30, 2011 16:22:43 Simon Wunderlich wrote:
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.
Applied in revision 00ca20e.
Thanks,
Marek