d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC:

Browse Source 
Add some initial locking to gif(4), that covers output path.
This commit is contained in:
glebius 2006-01-31 15:56:47 +00:00
parent 164ce7afe5
commit c625a74834
4 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys/net/if_gif.c
View File

@ -90,7 +90,6 @@
/*
* gif_mtx protects the global gif_softc_list.
* XXX: Per-softc locking is still required.
*/
static struct mtx gif_mtx;
static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface");
@ -154,22 +153,11 @@ gif_clone_create(ifc, unit)
return (ENOSPC);
}
GIF_LOCK_INIT(sc);
GIF2IFP(sc)->if_softc = sc;
if_initname(GIF2IFP(sc), ifc->ifc_name, unit);
gifattach0(sc);
mtx_lock(&gif_mtx);
LIST_INSERT_HEAD(&gif_softc_list, sc, gif_list);
mtx_unlock(&gif_mtx);
return (0);
}
void
gifattach0(sc)
struct gif_softc *sc;
{
sc->encap_cookie4 = sc->encap_cookie6 = NULL;
GIF2IFP(sc)->if_addrlen = 0;
@ -187,6 +175,12 @@ gifattach0(sc)
bpfattach(GIF2IFP(sc), DLT_NULL, sizeof(u_int32_t));
if (ng_gif_attach_p != NULL)
(*ng_gif_attach_p)(GIF2IFP(sc));
mtx_lock(&gif_mtx);
LIST_INSERT_HEAD(&gif_softc_list, sc, gif_list);
mtx_unlock(&gif_mtx);
return (0);
}
static void
@ -215,6 +209,8 @@ gif_destroy(struct gif_softc *sc)
if_detach(ifp);
if_free(ifp);
GIF_LOCK_DESTROY(sc);
free(sc, M_GIF);
}
@ -428,6 +424,9 @@ gif_output(ifp, m, dst, rt)
m_tag_prepend(m, mtag);
m->m_flags &= ~(M_BCAST|M_MCAST);
GIF_LOCK(sc);
if (!(ifp->if_flags & IFF_UP) ||
sc->gif_psrc == NULL || sc->gif_pdst == NULL) {
m_freem(m);
@ -477,7 +476,8 @@ gif_output(ifp, m, dst, rt)
end:
if (error)
ifp->if_oerrors++;
return error;
GIF_UNLOCK(sc);
return (error);
}
void
@ -844,11 +844,8 @@ gif_set_tunnel(ifp, src, dst)
struct gif_softc *sc = ifp->if_softc;
struct gif_softc *sc2;
struct sockaddr *osrc, *odst, *sa;
int s;
int error = 0;
s = splnet();
mtx_lock(&gif_mtx);
LIST_FOREACH(sc2, &gif_softc_list, gif_list) {
if (sc2 == sc)
@ -942,7 +939,6 @@ gif_set_tunnel(ifp, src, dst)
ifp->if_drv_flags |= IFF_DRV_RUNNING;
else
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
splx(s);
return 0;
@ -951,7 +947,6 @@ gif_set_tunnel(ifp, src, dst)
ifp->if_drv_flags |= IFF_DRV_RUNNING;
else
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
splx(s);
return error;
}
@ -961,9 +956,6 @@ gif_delete_tunnel(ifp)
struct ifnet *ifp;
{
struct gif_softc *sc = ifp->if_softc;
int s;
s = splnet();
if (sc->gif_psrc) {
free((caddr_t)sc->gif_psrc, M_IFADDR);
@ -985,5 +977,4 @@ gif_delete_tunnel(ifp)
ifp->if_drv_flags |= IFF_DRV_RUNNING;
else
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
splx(s);
}

8
sys/net/if_gif.h
View File

@ -57,6 +57,7 @@ extern void (*ng_gif_detach_p)(struct ifnet *ifp);
struct gif_softc {
struct ifnet *gif_ifp;
struct mtx gif_mtx;
struct sockaddr *gif_psrc; /* Physical src addr */
struct sockaddr *gif_pdst; /* Physical dst addr */
union {
@ -72,6 +73,12 @@ struct gif_softc {
LIST_ENTRY(gif_softc) gif_list; /* all gif's are linked */
};
#define GIF2IFP(sc) ((sc)->gif_ifp)
#define GIF_LOCK_INIT(sc) mtx_init(&(sc)->gif_mtx, "gif softc", \
NULL, MTX_DEF)
#define GIF_LOCK_DESTROY(sc) mtx_destroy(&(sc)->gif_mtx)
#define GIF_LOCK(sc) mtx_lock(&(sc)->gif_mtx)
#define GIF_UNLOCK(sc) mtx_unlock(&(sc)->gif_mtx)
#define GIF_LOCK_ASSERT(sc) mtx_assert(&(sc)->gif_mtx, MA_OWNED)
#define gif_ro gifsc_gifscr.gifscr_ro
#ifdef INET6
@ -94,7 +101,6 @@ struct etherip_header {
#define ETHERIP_VERSION 0x03
/* Prototypes */
void gifattach0(struct gif_softc *);
void gif_input(struct mbuf *, int, struct ifnet *);
int gif_output(struct ifnet *, struct mbuf *, struct sockaddr *,
struct rtentry *);

2
sys/netinet/in_gif.c
View File

@ -104,6 +104,8 @@ in_gif_output(ifp, family, m)
int proto, error;
u_int8_t tos;
GIF_LOCK_ASSERT(sc);
if (sin_src == NULL || sin_dst == NULL ||
sin_src->sin_family != AF_INET ||
sin_dst->sin_family != AF_INET) {

2
sys/netinet6/in6_gif.c
View File

@ -97,6 +97,8 @@ in6_gif_output(ifp, family, m)
int proto, error;
u_int8_t itos, otos;
GIF_LOCK_ASSERT(sc);
if (sin6_src == NULL || sin6_dst == NULL ||
sin6_src->sin6_family != AF_INET6 ||
sin6_dst->sin6_family != AF_INET6) {