From: Daniel Lenski <dlenski@gmail.com>
Date: Thu, 14 May 2020 21:30:41 +0000 (-0700)
Subject: fix HDLC packet logging buffer overflow
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a3e5b98e13e0a8374eb3344500ed1de28dc3cf0e;p=users%2Fdwmw2%2Fopenconnect.git

fix HDLC packet logging buffer overflow

Signed-off-by: Daniel Lenski <dlenski@gmail.com>
---

diff --git a/ppp.c b/ppp.c
index 265506ce..2c2ab08c 100644
--- a/ppp.c
+++ b/ppp.c
@@ -782,7 +782,7 @@ int ppp_mainloop(struct openconnect_info *vpninfo, int *timeout, int readable)
 							 _("Packet contains %ld bytes after payload. Concatenated packets are not handled yet.\n"),
 							 len - (pp - ph));
 			if (vpninfo->dump_http_traffic)
-				dump_buf_hex(vpninfo, PRG_TRACE, '<', pp, payload_len);
+				dump_buf_hex(vpninfo, PRG_TRACE, '<', ph, payload_len);
 			break;
 
 		case PPP_ENCAP_NX_HDLC:
@@ -797,7 +797,7 @@ int ppp_mainloop(struct openconnect_info *vpninfo, int *timeout, int readable)
 							 _("Packet contains %ld bytes after payload. Concatenated packets are not handled yet.\n"),
 							 len - (pp - ph));
 			if (vpninfo->dump_http_traffic)
-				dump_buf_hex(vpninfo, PRG_TRACE, '<', pp, payload_len);
+				dump_buf_hex(vpninfo, PRG_TRACE, '<', ph + ppp->encap_len, payload_len);
 			break;
 
 		default: