git: b501c72ad305 - stable/13 - pf: make DIOCGETSTATESNV iterations killable
Mateusz Guzik
mjg at FreeBSD.org
Mon Jul 5 11:33:59 UTC 2021
The branch stable/13 has been updated by mjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=b501c72ad3054b6043c23fdcb7f95d7f26abe39c
commit b501c72ad3054b6043c23fdcb7f95d7f26abe39c
Author: Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-07-02 07:28:48 +0000
Commit: Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-07-05 11:32:15 +0000
pf: make DIOCGETSTATESNV iterations killable
Reviewed by: kp
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit 48d5b86364fa8e86318805d0078ccf9066e94ae8)
---
sys/netpfil/pf/pf_ioctl.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index 49d5b2d216d2..0097d8b0f6b6 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -5060,6 +5060,11 @@ pf_getstates(struct pfioc_nv *nv)
if (s->timeout == PFTM_UNLINKED)
continue;
+ if (SIGPENDING(curthread)) {
+ PF_HASHROW_UNLOCK(ih);
+ ERROUT(EINTR);
+ }
+
nvls = pf_state_to_nvstate(s);
if (nvls == NULL) {
PF_HASHROW_UNLOCK(ih);
More information about the dev-commits-src-all
mailing list