The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=f5777c123a6382f5fdc9732a87c8fa1ff672f148
commit f5777c123a6382f5fdc9732a87c8fa1ff672f148
Author: orange30 <44566632+orang...@users.noreply.github.com>
AuthorDate: 2021-09-01 15:37:36 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2021-09-10 13:45:26 +0000
net: Fix memory leaks upon arp_fillheader() failures
Free memory before return from arprequest_internal(). In in_arpinput(),
if arp_fillheader() fails, it should use goto drop.
Reviewed by: melifaro, imp, markj
MFC after: 1 week
Pull Request: https://github.com/freebsd/freebsd-src/pull/534
---
sys/netinet/if_ether.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 2f92d623feeb..5400f35d953f 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -418,6 +418,7 @@ arprequest_internal(struct ifnet *ifp, const struct in_addr
*sip,
linkhdrsize = sizeof(linkhdr);
error = arp_fillheader(ifp, ah, 1, linkhdr, &linkhdrsize);
if (error != 0 && error != EAFNOSUPPORT) {
+ m_freem(m);
ARP_LOG(LOG_ERR, "Failed to calculate ARP header on %s: %d\n",
if_name(ifp), error);
return (error);
@@ -1128,7 +1129,7 @@ reply:
if (error != 0 && error != EAFNOSUPPORT) {
ARP_LOG(LOG_ERR, "Failed to calculate ARP header on %s: %d\n",
if_name(ifp), error);
- return;
+ goto drop;
}
ro.ro_prepend = linkhdr;
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
