]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
fix HDLC packet logging buffer overflow
authorDaniel Lenski <dlenski@gmail.com>
Thu, 14 May 2020 21:30:41 +0000 (14:30 -0700)
committerDaniel Lenski <dlenski@gmail.com>
Thu, 14 May 2020 23:11:04 +0000 (16:11 -0700)
Signed-off-by: Daniel Lenski <dlenski@gmail.com>
ppp.c

diff --git a/ppp.c b/ppp.c
index 265506ce9c0dbcfc015ecac4c19da9e87fe52a71..2c2ab08c3cfd4c14a6e68946eb02f5364b359eb1 100644 (file)
--- 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: