git: 48d5b86364fa - main - pf: make DIOCGETSTATESNV iterations killable

[Mateusz Guzik]

The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=48d5b86364fa8e86318805d0078ccf9066e94ae8

commit 48d5b86364fa8e86318805d0078ccf9066e94ae8
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-02 08:30:22 +0000

    pf: make DIOCGETSTATESNV iterations killable
    
    Reviewed by:    kp
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 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 928e4a1259cc..a802780277aa 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -5059,6 +5059,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);