git: c80a4b76ceac - main - ipdivert: check that PCB is still valid after taking INPCB_RLOCK.

[Andrey V. Elsukov]

The branch main has been updated by ae:

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

commit c80a4b76ceacc5aab322e7ac1407eea8c90cb3b1
Author:     Andrey V. Elsukov <ae at FreeBSD.org>
AuthorDate: 2021-03-30 09:31:09 +0000
Commit:     Andrey V. Elsukov <ae at FreeBSD.org>
CommitDate: 2021-03-30 09:31:09 +0000

    ipdivert: check that PCB is still valid after taking INPCB_RLOCK.
    
    We are inspecting PCBs of divert sockets under NET_EPOCH section,
    but PCB could be already detached and we should check INP_FREED flag
    when we took INP_RLOCK.
    
    PR:             254478
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D29420
---
 sys/netinet/ip_divert.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 65f1d263b5fa..70d3fbd1f230 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -280,6 +280,10 @@ divert_packet(struct mbuf *m, bool incoming)
 		/* XXX why does only one socket match? */
 		if (inp->inp_lport == nport) {
 			INP_RLOCK(inp);
+			if (__predict_false(inp->inp_flags2 & INP_FREED)) {
+				INP_RUNLOCK(inp);
+				continue;
+			}
 			sa = inp->inp_socket;
 			SOCKBUF_LOCK(&sa->so_rcv);
 			if (sbappendaddr_locked(&sa->so_rcv,