diff options
| author | Eugene Grosbein <eugen@FreeBSD.org> | 2021-09-09 05:04:31 +0700 |
|---|---|---|
| committer | Eugene Grosbein <eugen@FreeBSD.org> | 2021-09-09 05:07:53 +0700 |
| commit | 1f6fcc264e1dfc53f5cd42cad335e5375abe080d (patch) | |
| tree | 860ef1ad90bcda958f38f29f645d10fe613dfc30 /net/mpd5 | |
| parent | security/vuxml: add net/mpd5 PPPoE Server remotely exploitable crash (diff) | |
net/mpd5: fix PPPoE Server remotely exploitable crash
This is security fix for PPPoE servers.
Insufficient validation of incoming PPPoE Discovery request
specially crafted by unauthenticated user might lead to unexpected
termination of the process. The problem affects mpd versions since 5.0.
Installations not using PPPoE server configuration were not affected.
Reported by: paul & Yannick C at SourceForge
Tested by: paul & Yannick C at SourceForge
Security: f55921aa-10c9-11ec-8647-00e0670f2660
Diffstat (limited to 'net/mpd5')
| -rw-r--r-- | net/mpd5/Makefile | 2 | ||||
| -rw-r--r-- | net/mpd5/files/patch-pppoe.c | 34 |
2 files changed, 35 insertions, 1 deletions
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile index 1955acfe1817..81fc894b519b 100644 --- a/net/mpd5/Makefile +++ b/net/mpd5/Makefile @@ -2,7 +2,7 @@ PORTNAME= mpd DISTVERSION= 5.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION} PKGNAMESUFFIX= 5 diff --git a/net/mpd5/files/patch-pppoe.c b/net/mpd5/files/patch-pppoe.c new file mode 100644 index 000000000000..ccc3e117df6a --- /dev/null +++ b/net/mpd5/files/patch-pppoe.c @@ -0,0 +1,34 @@ +Index: src/pppoe.c +=================================================================== +--- src/pppoe.c (revision 2420) ++++ src/pppoe.c (revision 2423) +@@ -1257,6 +1257,8 @@ PppoeListenEvent(int type, void *arg) + const struct pppoe_hdr *ph; + const struct pppoe_tag *tag; + ++ u_int16_t length; ++ + union { + u_char buf[sizeof(struct ngpppoe_init_data) + MAX_SESSION]; + struct ngpppoe_init_data poeid; +@@ -1288,6 +1290,20 @@ PppoeListenEvent(int type, void *arg) + + wh = (struct pppoe_full_hdr *)response; + ph = &wh->ph; ++ ++ /* Sanity check */ ++ length = ntohs(ph->length); ++ if (length > (size_t)sz - sizeof(struct pppoe_full_hdr)) { ++ Log(LG_PHYS, ("Ignored incoming PPPoE connection request " ++ "via %s for service \"%s\" from %s " ++ "due to bad length %hu > %u", ++ PIf->ifnodepath, session, ++ ether_ntoa((const struct ether_addr *)&wh->eh.ether_shost), ++ length, ++ (unsigned)((size_t)sz - sizeof(struct pppoe_full_hdr)))); ++ return; ++ } ++ + if ((tag = get_tag(ph, PTT_SRV_NAME))) { + size_t len = ntohs(tag->tag_len); + if (len >= sizeof(real_session)) |