Skip to content

reject too-short PROXY v2 address length in mod_remoteip #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arshsmith1 wants to merge 1 commit into
base: trunk
Choose a base branch
from
+15 −1
Open

reject too-short PROXY v2 address length in mod_remoteip #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/log-message-tags/next-number
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10595
10597
14 changes: 14 additions & 0 deletions modules/metadata/mod_remoteip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,13 @@ static remoteip_parse_status_t remoteip_process_v2_header(conn_rec *c,
case 0x01: /* PROXY command */
switch (hdr->v2.fam) {
case 0x11: /* TCPv4 */
if (ntohs(hdr->v2.len) < sizeof(hdr->v2.addr.ip4)) {
ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(10595)
"RemoteIPProxyProtocol: address length %hu "
"too short for TCPv4",
(unsigned short)ntohs(hdr->v2.len));
return HDR_ERROR;
}
ret = apr_sockaddr_info_get(&conn_conf->client_addr, NULL,
APR_INET,
ntohs(hdr->v2.addr.ip4.src_port),
Expand All @@ -971,6 +978,13 @@ static remoteip_parse_status_t remoteip_process_v2_header(conn_rec *c,

case 0x21: /* TCPv6 */
#if APR_HAVE_IPV6
if (ntohs(hdr->v2.len) < sizeof(hdr->v2.addr.ip6)) {
ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(10596)
"RemoteIPProxyProtocol: address length %hu "
"too short for TCPv6",
(unsigned short)ntohs(hdr->v2.len));
return HDR_ERROR;
}
ret = apr_sockaddr_info_get(&conn_conf->client_addr, NULL,
APR_INET6,
ntohs(hdr->v2.addr.ip6.src_port),
Expand Down