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

Commit 7f40d91d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: rmnet_data: Check for context when freeing packing in TX path"

parents 2001a040 4c42be4f

net/rmnet_data/rmnet_map_data.c

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ void rmnet_map_aggregate(struct sk_buff *skb, 
		config->agg_count = 1;

		getnstimeofday(&config->agg_time);

		trace_rmnet_start_aggregation(skb);

		rmnet_kfree_skb(skb, RMNET_STATS_SKBFREE_AGG_CPY_EXPAND);

		dev_kfree_skb_any(skb);

		goto schedule;

	}

	diff = timespec_sub(config->agg_last, config->agg_time);
@@ -321,7 +321,7 @@ void rmnet_map_aggregate(struct sk_buff *skb, 
	dest_buff = skb_put(config->agg_skb, skb->len);

	memcpy(dest_buff, skb->data, skb->len);

	config->agg_count++;

	rmnet_kfree_skb(skb, RMNET_STATS_SKBFREE_AGG_INTO_BUFF);

	dev_kfree_skb_any(skb);



schedule:

	if (config->agg_state != RMNET_MAP_TXFER_SCHEDULED) {