The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=bb8e1dfbff30e5df97fa31c88f8218af054fe166
commit bb8e1dfbff30e5df97fa31c88f8218af054fe166 Author: Kristof Provost <[email protected]> AuthorDate: 2022-04-06 14:45:18 +0000 Commit: Kristof Provost <[email protected]> CommitDate: 2022-04-14 07:46:25 +0000 pf: use ERROUT_IOCTL() Use ERROUT_IOCTL() rather than hand-rolling the macro. This adds DTrace SDTs in the error path, making debugging ioctl errors easier. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit bef7104571f35eeffc27b25d8857a7940dd23ab8) --- sys/netpfil/pf/pf_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 5d4b90f395d5..fd0eb5b85299 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2683,7 +2683,7 @@ DIOCGETRULENV_error: newrule->cpid = td->td_proc ? td->td_proc->p_pid : 0; TAILQ_INIT(&newrule->rpool.list); } -#define ERROUT(x) { error = (x); goto DIOCCHANGERULE_error; } +#define ERROUT(x) ERROUT_IOCTL(DIOCCHANGERULE_error, x) PF_RULES_WLOCK(); #ifdef PF_WANT_32_TO_64_COUNTER
