diff options
| author | Antonio Quartulli <ordex@autistici.org> | 2011-10-16 20:32:03 +0200 |
|---|---|---|
| committer | Sven Eckelmann <sven@narfation.org> | 2011-11-20 13:08:34 +0100 |
| commit | 8b7342d673d31e7aa60baae35321c11532275cdb (patch) | |
| tree | 5e6790ae621aad9fda859fcb39aa626dcfb8bb4d /net/batman-adv/routing.c | |
| parent | batman-adv: linearise the tt_response skb only if needed (diff) | |
| download | linux-8b7342d673d31e7aa60baae35321c11532275cdb.tar.xz linux-8b7342d673d31e7aa60baae35321c11532275cdb.zip | |
batman-adv: check for tt_reponse packet real length
Before accessing the TT_RESPONSE packet payload, the node has to ensure that the
packet is long enough as it would expect to be.
Reported-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/routing.c')
| -rw-r--r-- | net/batman-adv/routing.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index e0e7b7b79ca9..ef24a7205f65 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -578,6 +578,7 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) { struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct tt_query_packet *tt_query; + uint16_t tt_len; struct ethhdr *ethhdr; /* drop packet if it has not necessary minimum size */ @@ -622,6 +623,14 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) if (skb_linearize(skb) < 0) goto out; + tt_len = tt_query->tt_data * sizeof(struct tt_change); + + /* Ensure we have all the claimed data */ + if (unlikely(skb_headlen(skb) < + sizeof(struct tt_query_packet) + + tt_len)) + goto out; + handle_tt_response(bat_priv, tt_query); } else { bat_dbg(DBG_TT, bat_priv, |