File tcpdump-CVE-2014-9140.patch of Package tcpdump

Overview Repositories Revisions Requests Users Attributes Meta

File tcpdump-CVE-2014-9140.patch of Package tcpdump (Revision e2b4ab3c8e9fad7ae46788c01e895726)

Currently displaying revision e2b4ab3c8e9fad7ae46788c01e895726 , Show latest

commit 0f95d441e4b5d7512cc5c326c8668a120e048eda
Author: Guy Harris <guy@alum.mit.edu>
Date:   Wed Oct 22 12:31:21 2014 -0700

Do bounds checking when unescaping PPP.
    
    Clean up a const issue while we're at it.

Index: tcpdump-4.5.1/print-ppp.c
===================================================================
--- tcpdump-4.5.1.orig/print-ppp.c	2015-03-19 11:37:29.603877744 +0100
+++ tcpdump-4.5.1/print-ppp.c	2015-03-19 14:03:53.530516518 +0100
@@ -1266,11 +1266,15 @@ trunc:
 static void
 ppp_hdlc(const u_char *p, int length)
 {
-	u_char *b, *s, *t, c;
+	u_char *b, *t, c;
+	const u_char *s;
 	int i, proto;
 	const void *se;
 
-	b = (u_int8_t *)malloc(length);
+	if (length <= 0)
+		return;
+
+	b = (u_char *)malloc(length);
 	if (b == NULL)
 		return;
 
@@ -1279,14 +1283,13 @@ ppp_hdlc(const u_char *p, int length)
 	 * Do this so that we dont overwrite the original packet
 	 * contents.
 	 */
-	for (s = (u_char *)p, t = b, i = length; i > 0; i--) {
+	for (s = p, t = b, i = length; i > 0 && TTEST(*s); i--) {
 		c = *s++;
 		if (c == 0x7d) {
-			if (i > 1) {
-				i--;
-				c = *s++ ^ 0x20;
-			} else
-				continue;
+			if (i <= 1 || !TTEST(*s))
+				break;
+			i--;
+			c = *s++ ^ 0x20;
 		}
 		*t++ = c;
 	}

Places

File tcpdump-CVE-2014-9140.patch of Package tcpdump (Revision e2b4ab3c8e9fad7ae46788c01e895726)

Places