Date: Sat, 15 Oct 2005 16:58:22 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/netinet in.c Message-ID: <200510151658.j9FGwMJX074338@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
rwatson 2005-10-15 16:58:21 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_6)
sys/netinet in.c
Log:
Merge in.c:1.89,1.90 from HEAD to RELENG_6:
Acquire Giant conditionally in in_addmulti() and in_delmulti() based on
whether the interface being accessed is IFF_NEEDSGIANT or not. This
avoids lock order reversals when calling into the interface ioctl
handler, which could potentially lead to deadlock.
The long term solution is to eliminate non-MPSAFE network drivers.
Discussed with: jhb
Unlock Giant symmetrically with respect to lock acquire order as that's
generally nicer.
Spotted by: johan
RELENG_6_0 candidate.
MFC after: 1 day
Approved by: re (kensmith)
Revision Changes Path
1.85.2.4 +9 -0 src/sys/netinet/in.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510151658.j9FGwMJX074338>