Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't allow to connect a non ethernet interface to a PPPoE interface.

This commit is contained in:
tron 2006-04-27 13:19:04 +00:00
parent ecfb43361d
commit 7604b6a404
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/net/if_pppoe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_pppoe.c,v 1.65 2006/04/15 02:22:44 christos Exp $ */
/* $NetBSD: if_pppoe.c,v 1.66 2006/04/27 13:19:04 tron Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.65 2006/04/15 02:22:44 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.66 2006/04/27 13:19:04 tron Exp $");
#include "pppoe.h"
#include "bpfilter.h"
@ -861,10 +861,13 @@ pppoe_ioctl(struct ifnet *ifp, unsigned long cmd, caddr_t data)
return error;
if (parms->eth_ifname[0] != 0) {
sc->sc_eth_if = ifunit(parms->eth_ifname);
if (sc->sc_eth_if == NULL)
if (sc->sc_eth_if == NULL ||
sc->sc_eth_if->if_dlt != DLT_EN10MB) {
sc->sc_eth_if = NULL;
return ENXIO;
}
}
if (parms->ac_name) {
if (parms->ac_name != NULL) {
size_t s;
char *b = malloc(parms->ac_name_len + 1, M_DEVBUF,
M_WAITOK);
@ -884,7 +887,7 @@ pppoe_ioctl(struct ifnet *ifp, unsigned long cmd, caddr_t data)
free(sc->sc_concentrator_name, M_DEVBUF);
sc->sc_concentrator_name = b;
}
if (parms->service_name) {
if (parms->service_name != NULL) {
size_t s;
char *b = malloc(parms->service_name_len + 1, M_DEVBUF,
M_WAITOK);