Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7da19971 authored by Marek Lindner's avatar Marek Lindner Committed by Antonio Quartulli
Browse files

batman-adv: check return value of pskb_trim_rcsum() 



Reported-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Acked-by: default avatarMartin Hundebøll <martin@hundeboll.net>
Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
parent 293c9c1c

net/batman-adv/network-coding.c

+6 −2
Original line number Diff line number Diff line
@@ -1514,6 +1514,7 @@ batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, 
	struct ethhdr *ethhdr, ethhdr_tmp;

	uint8_t *orig_dest, ttl, ttvn;

	unsigned int coding_len;

	int err;



	/* Save headers temporarily */

	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);



	/* Resize decoded skb if decoded with larger packet */

	if (nc_packet->skb->len > coding_len + h_size)

		pskb_trim_rcsum(skb, coding_len + h_size);

	if (nc_packet->skb->len > coding_len + h_size) {

		err = pskb_trim_rcsum(skb, coding_len + h_size);

		if (err)

			return NULL;

	}



	/* Create decoded unicast packet */

	unicast_packet = (struct batadv_unicast_packet *)skb->data;