iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

batman-adv: check return value of pskb_trim_rcsum()

Browse Source 
Reported-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Acked-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
This commit is contained in:
Marek Lindner 2013-05-07 19:25:02 +08:00 committed by Antonio Quartulli
parent 293c9c1cef
commit 7da19971a9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/batman-adv/network-coding.c
View File

@ -1514,6 +1514,7 @@ batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,
struct ethhdr *ethhdr, ethhdr_tmp; struct ethhdr *ethhdr, ethhdr_tmp;
uint8_t *orig_dest, ttl, ttvn; uint8_t *orig_dest, ttl, ttvn;
unsigned int coding_len; unsigned int coding_len;
int err;
/* Save headers temporarily */ /* Save headers temporarily */
memcpy(&coded_packet_tmp, skb->data, sizeof(coded_packet_tmp)); memcpy(&coded_packet_tmp, skb->data, sizeof(coded_packet_tmp));
@ -1568,8 +1569,11 @@ batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,
coding_len); coding_len);
/* Resize decoded skb if decoded with larger packet */ /* Resize decoded skb if decoded with larger packet */
if (nc_packet->skb->len > coding_len + h_size) if (nc_packet->skb->len > coding_len + h_size) {
pskb_trim_rcsum(skb, coding_len + h_size); err = pskb_trim_rcsum(skb, coding_len + h_size);
if (err)
return NULL;
}
/* Create decoded unicast packet */ /* Create decoded unicast packet */
unicast_packet = (struct batadv_unicast_packet *)skb->data; unicast_packet = (struct batadv_unicast_packet *)skb->data;