git: 34033bc5b9fa - stable/10 - if_firewire: fixing panic upon packet reception for VNET build

Tai-hwa Liang avatar at FreeBSD.org
Tue May 25 14:13:34 UTC 2021


The branch stable/10 has been updated by avatar:

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

commit 34033bc5b9fa8eaf3b12759227bf6f82328e5f00
Author:     Tai-hwa Liang <avatar at FreeBSD.org>
AuthorDate: 2021-04-10 15:32:27 +0000
Commit:     Tai-hwa Liang <avatar at FreeBSD.org>
CommitDate: 2021-05-17 10:29:12 +0000

    if_firewire: fixing panic upon packet reception for VNET build
    
    netisr_dispatch_src() needs valid VNET pointer or firewire_input() will panic
    when receiving a packet.
    
    Reviewed by:    glebius
    MFC after:      2 weeks
    
    (cherry picked from commit d9b61e7153c64b141436b4d9619b166c6d35a0a6)
---
 sys/net/if_fwsubr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c
index ba26cb40f621..c85ffd02b351 100644
--- a/sys/net/if_fwsubr.c
+++ b/sys/net/if_fwsubr.c
@@ -628,7 +628,9 @@ firewire_input(struct ifnet *ifp, struct mbuf *m, uint16_t src)
 	}
 
 	M_SETFIB(m, ifp->if_fib);
+	CURVNET_SET_QUIET(ifp->if_vnet);
 	netisr_dispatch(isr, m);
+	CURVNET_RESTORE();
 }
 
 int


More information about the dev-commits-src-all mailing list