Differential D29011

wg: Fix some mbuf leaks in the input path
ClosedPublic
Actions

Authored by markj on Mar 2 2021, 3:10 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Wed, Oct 30, 11:08 AM

	Unknown Object (File)
	Sun, Oct 27, 4:14 PM

	Unknown Object (File)
	Sun, Oct 27, 4:12 PM

	Unknown Object (File)
	Sun, Oct 27, 4:12 PM

	Unknown Object (File)
	Sun, Oct 27, 4:12 PM

	Unknown Object (File)
	Mon, Oct 21, 4:36 AM

	Unknown Object (File)
	Mon, Oct 21, 4:36 AM

	Unknown Object (File)
	Mon, Oct 21, 4:35 AM

View All 56 Files

Subscribers

Details

Reviewers

grehan
mmacy

Commits

rG11d845713834: wg: Avoid leaking mbufs when the input handshake queue is full
rG47495bf648a3: wg: Avoid leaking mbufs when the input handshake queue is full
rGa11009dccb6a: wg: Avoid leaking mbufs when the input handshake queue is full

Summary

When m_defrag() fails we have to free the mbuf ourselves.
If the handshake input queue is full, we are responsible for dropping the packet.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

markj created this revision.Mar 2 2021, 3:10 PM

Herald added a subscriber: imp. · View Herald TranscriptMar 2 2021, 3:11 PM

markj requested review of this revision.Mar 2 2021, 3:11 PM

Harbormaster completed remote builds in B37501: Diff 84949.Mar 2 2021, 3:11 PM

markj added reviewers: grehan, mmacy.Mar 2 2021, 3:11 PM

markj added inline comments.Mar 2 2021, 3:13 PM

sys/dev/if_wg/module/if_wg_session.c
1945	How is this queue locked?

afedorov added a subscriber: afedorov.Mar 2 2021, 5:19 PM

afedorov added inline comments.

sys/dev/if_wg/module/if_wg_session.c
1908–1914	Hmm, is m_defrag() really needed here? This is a very costly operation due to allocation. Because we only need to get "pkttype", maybe using m_pullup is enough?

markj added inline comments.Mar 2 2021, 5:41 PM

sys/dev/if_wg/module/if_wg_session.c
1908–1914	That's a good question. wg_handshake() assumes that the entire packet is contiguous, though, so a pullup to get the packet type is not sufficient.

grehan accepted this revision.Mar 8 2021, 6:45 AM

This revision is now accepted and ready to land.Mar 8 2021, 6:45 AM

Closed by commit rGa11009dccb6a: wg: Avoid leaking mbufs when the input handshake queue is full (authored by markj). · Explain WhyMar 8 2021, 5:55 PM

This revision was automatically updated to reflect the committed changes.

markj added a commit: rGa11009dccb6a: wg: Avoid leaking mbufs when the input handshake queue is full.

markj added a commit: rG47495bf648a3: wg: Avoid leaking mbufs when the input handshake queue is full.Mar 11 2021, 3:54 PM

markj added a commit: rG11d845713834: wg: Avoid leaking mbufs when the input handshake queue is full.Mar 11 2021, 4:44 PM

Revision Contents
Changeset List

Path

Size

sys/

dev/

if_wg/

module/

if_wg_session.c

5 lines

Diff 85339

sys/dev/if_wg/module/if_wg_session.c

Loading...