Commit 30724ccb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'wireguard-fixes' 



Jason A. Donenfeld says:

====================
wireguard fixes for 5.7-rc4

This series contains two fixes and a cleanup for wireguard:

1) Removal of a spurious newline, from Sultan Alsawaf.

2) Fix for a memory leak in an error path, in which memory allocated
   prior to the error wasn't freed, reported by Sultan Alsawaf.

3) Fix to ECN support to use RFC6040 properly like all the other tunnel
   drivers, from Toke Høiland-Jørgensen.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 42c556fe eebabcb2

drivers/net/wireguard/queueing.c

+3 −1
Original line number Diff line number Diff line
@@ -35,8 +35,10 @@ int wg_packet_queue_init(struct crypt_queue *queue, work_func_t function, 
		if (multicore) {

			queue->worker = wg_packet_percpu_multicore_worker_alloc(

				function, queue);

			if (!queue->worker)

			if (!queue->worker) {

				ptr_ring_cleanup(&queue->ring, NULL);

				return -ENOMEM;

			}

		} else {

			INIT_WORK(&queue->work, function);

		}

drivers/net/wireguard/receive.c

+2 −4
Original line number Diff line number Diff line
@@ -393,13 +393,11 @@ static void wg_packet_consume_data_done(struct wg_peer *peer, 
		len = ntohs(ip_hdr(skb)->tot_len);

		if (unlikely(len < sizeof(struct iphdr)))

			goto dishonest_packet_size;

		if (INET_ECN_is_ce(PACKET_CB(skb)->ds))

			IP_ECN_set_ce(ip_hdr(skb));

		INET_ECN_decapsulate(skb, PACKET_CB(skb)->ds, ip_hdr(skb)->tos);

	} else if (skb->protocol == htons(ETH_P_IPV6)) {

		len = ntohs(ipv6_hdr(skb)->payload_len) +

		      sizeof(struct ipv6hdr);

		if (INET_ECN_is_ce(PACKET_CB(skb)->ds))

			IP6_ECN_set_ce(skb, ipv6_hdr(skb));

		INET_ECN_decapsulate(skb, PACKET_CB(skb)->ds, ipv6_get_dsfield(ipv6_hdr(skb)));

	} else {

		goto dishonest_packet_type;

	}

drivers/net/wireguard/send.c

+0 −1
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ void wg_packet_encrypt_worker(struct work_struct *work) 
		}

		wg_queue_enqueue_per_peer(&PACKET_PEER(first)->tx_queue, first,

					  state);



	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE