diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2021-07-26 20:39:18 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-07-26 20:39:37 +0000 |
| commit | ba21825202737a8b7e90e1ef669c7fe7e7d50325 (patch) | |
| tree | 13ad9c48b740ab09135dca315c89c8390620e002 | |
| parent | accff08c2f6a8d1e36118993db5a792862cc3839 (diff) | |
| download | src-ba21825202737a8b7e90e1ef669c7fe7e7d50325.tar.gz src-ba21825202737a8b7e90e1ef669c7fe7e7d50325.zip | |
rip: Add missing minimum length validation in rip_output()
If the socket is configured such that the sender is expected to supply
the IP header, then we need to verify that it actually did so.
Reported by: syzkaller+KMSAN
Reviewed by: donner
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D31302
| -rw-r--r-- | sys/netinet/raw_ip.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 1db73a6da68c..996440227145 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -523,8 +523,15 @@ rip_output(struct mbuf *m, struct socket *so, ...) } else { if (m->m_pkthdr.len > IP_MAXPACKET) { m_freem(m); - return(EMSGSIZE); + return (EMSGSIZE); } + if (m->m_pkthdr.len < sizeof(*ip)) { + m_freem(m); + return (EINVAL); + } + m = m_pullup(m, sizeof(*ip)); + if (m == NULL) + return (ENOMEM); ip = mtod(m, struct ip *); hlen = ip->ip_hl << 2; if (m->m_len < hlen) { |