git: 98b05b41e8c6 - stable/12 - pf: make DIOCGETSTATESNV iterations killable

[Mateusz Guzik]

The branch stable/12 has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=98b05b41e8c69e6c737759ad33fa0117d89aedee

commit 98b05b41e8c69e6c737759ad33fa0117d89aedee
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:39:06 +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 ce7a8d1dc582..0ce39db05c15 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -5127,6 +5127,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);