Paths

Table of Contentst

dummynet: fix ip_dn_vnet_init() / dummynet_task() race
AbandonedPublic
Actions

Authored by kp on Jul 4 2022, 9:08 PM.

Details

Reviewers

None

Group Reviewers

network
pfsense

Commits

rGcbb019b831ad: dummynet: fix ip_dn_vnet_init() / dummynet_task() race

Summary

If dummynet_task() is run on a vnet where dummynet is still initialising
(i.e. still running ip_dn_vnet_init()) we can attempt to use an
uninitialised mutex.

We can use the existing init_done field to check if the per-vnet
V_dn_cfg is fully set up, if we ensure that it's only set to 1 when
we've done all of the init work.

Reported by: Alfredo Dal'Ava Júnior <alfredo@freebsd.org>
Sponsored by: Rubicon Communications, LLC ("Netgate")

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

kp created this revision.Jul 4 2022, 9:08 PM

Herald added subscribers: glebius, donner, melifaro and 2 others. · View Herald TranscriptJul 4 2022, 9:08 PM

kp requested review of this revision.Jul 4 2022, 9:08 PM

Harbormaster completed remote builds in B46264: Diff 107769.Jul 4 2022, 9:08 PM

This revision was not accepted when it landed; it landed in state Needs Review.Jul 5 2022, 5:56 PM

Closed by commit rGcbb019b831ad: dummynet: fix ip_dn_vnet_init() / dummynet_task() race (authored by kp). · Explain Why

This revision was automatically updated to reflect the committed changes.

kp added a commit: rGcbb019b831ad: dummynet: fix ip_dn_vnet_init() / dummynet_task() race.

This commit breaks non-VIMAGE kernel build. Try MINIMAL kernel for example.

/usr/src/sys/netpfil/ipfw/ip_dn_io.c:674:4: error: 'continue' statement not in loop statement
                        continue;
                        ^
1 error generated.

jkim reopened this revision.Jul 6 2022, 2:46 PM

In D35716#810455, @jkim wrote:
This commit breaks non-VIMAGE kernel build. Try MINIMAL kernel for example.
/usr/src/sys/netpfil/ipfw/ip_dn_io.c:674:4: error: 'continue' statement not in loop statement
                        continue;
                        ^
1 error generated.

I'm aware and am testing a fix (to the vnet macros).

kp abandoned this revision.Oct 5 2022, 3:54 PM

Revision Contents
Changeset List

Path

Size

sys/

netpfil/

ipfw/

ip_dn_io.c

5 lines

ip_dummynet.c

4 lines

Diff 107800

View Options

sys/netpfil/ipfw/ip_dn_io.c