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

if_ipsec(4): protect against user supplying unknown address family

Browse Source 
Reviewed by:	ae, hselasky
Sponsored by:	NVIDIA Networking
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D38093
This commit is contained in:
Konstantin Belousov 2023-01-17 03:37:45 +02:00
parent fd5e921059
commit eac971545b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/net/if_ipsec.c
View File

@ -813,13 +813,17 @@ ipsec_srcaddr(void *arg __unused, const struct sockaddr *sa,
{
struct ipsec_softc *sc;
struct secasindex *saidx;
struct ipsec_iflist *iflist;
/* Check that VNET is ready */
if (V_ipsec_idhtbl == NULL)
return;
NET_EPOCH_ASSERT();
CK_LIST_FOREACH(sc, ipsec_srchash(sa), srchash) {
iflist = ipsec_srchash(sa);
if (iflist == NULL)
return;
CK_LIST_FOREACH(sc, iflist, srchash) {
if (sc->family == 0)
continue;
saidx = ipsec_getsaidx(sc, IPSEC_DIR_OUTBOUND, sa->sa_family);
@ -1015,12 +1019,18 @@ ipsec_set_tunnel(struct ipsec_softc *sc, struct sockaddr *src,
struct sockaddr *dst, uint32_t reqid)
{
struct epoch_tracker et;
struct ipsec_iflist *iflist;
struct secpolicy *sp[IPSEC_SPCOUNT];
int i;
sx_assert(&ipsec_ioctl_sx, SA_XLOCKED);
/* Allocate SP with new addresses. */
iflist = ipsec_srchash(src);
if (iflist == NULL) {
sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
return (EAFNOSUPPORT);
}
if (ipsec_newpolicies(sc, sp, src, dst, reqid) == 0) {
/* Add new policies to SPDB */
if (key_register_ifnet(sp, IPSEC_SPCOUNT) != 0) {
@ -1033,7 +1043,7 @@ ipsec_set_tunnel(struct ipsec_softc *sc, struct sockaddr *src,
for (i = 0; i < IPSEC_SPCOUNT; i++)
sc->sp[i] = sp[i];
sc->family = src->sa_family;
CK_LIST_INSERT_HEAD(ipsec_srchash(src), sc, srchash);
CK_LIST_INSERT_HEAD(iflist, sc, srchash);
} else {
sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
return (ENOMEM);