diff options
| author | Marek Lindner <lindner_marek@yahoo.de> | 2013-03-04 10:39:49 +0800 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2013-03-11 22:59:47 +0100 |
| commit | b47506d91259c29b9c75c404737eb6525556f9b4 (patch) | |
| tree | c23e5fb025c23fc7a19a0c5fdf4fdcd411596a9f /net/batman-adv | |
| parent | 7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b (diff) | |
| download | linux-3.10-b47506d91259c29b9c75c404737eb6525556f9b4.tar.gz linux-3.10-b47506d91259c29b9c75c404737eb6525556f9b4.tar.bz2 linux-3.10-b47506d91259c29b9c75c404737eb6525556f9b4.zip | |
batman-adv: verify tt len does not exceed packet len
batadv_iv_ogm_process() accesses the packet using the tt_num_changes
attribute regardless of the real packet len (assuming the length check
was done before). Therefore a length check is needed to avoid reading
random memory.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index a0b253ecada..a5bb0a769eb 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1288,7 +1288,8 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff; /* unpack the aggregated packets and process them one by one */ - do { + while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len, + batadv_ogm_packet->tt_num_changes)) { tt_buff = packet_buff + buff_pos + BATADV_OGM_HLEN; batadv_iv_ogm_process(ethhdr, batadv_ogm_packet, tt_buff, @@ -1299,8 +1300,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, packet_pos = packet_buff + buff_pos; batadv_ogm_packet = (struct batadv_ogm_packet *)packet_pos; - } while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len, - batadv_ogm_packet->tt_num_changes)); + } kfree_skb(skb); return NET_RX_SUCCESS; |