Mark Bergsma has submitted this change and it was merged.
Change subject: Fix PROXY bug
......................................................................
Fix PROXY bug
Peek recv size between proxy header size and max diagram size
Change-Id: I8a6fdf872718d528b2e61a23c70acfa4bf5ab79b
---
M bin/varnishd/proxy_proto.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
diff --git a/bin/varnishd/proxy_proto.c b/bin/varnishd/proxy_proto.c
index 6f03cd2..32c2aac 100644
--- a/bin/varnishd/proxy_proto.c
+++ b/bin/varnishd/proxy_proto.c
@@ -125,7 +125,7 @@
}
/* Read the PROXY header */
- if (recv(sp->fd, phdr, sizeof *phdr, MSG_PEEK) == sizeof *phdr
+ if (recv(sp->fd, phdr, sizeof *phdr, MSG_PEEK) >= sizeof (phdr->hdr)
&& memcmp(phdr->hdr.sig, v2sig, sizeof v2sig) == 0
&& phdr->hdr.len <= sizeof phdr->addr) {
msgsize = sizeof phdr->hdr + phdr->hdr.len;
--
To view, visit https://gerrit.wikimedia.org/r/82426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a6fdf872718d528b2e61a23c70acfa4bf5ab79b
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish
Gerrit-Branch: patches/proxy-support
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
