diff mbox series

[kirkstone] tcpdump: Remove patch fuzz from CVE-2024-2397

Message ID 129b72ccb76876396959d3024fbe9935f25aa2dc.1753993689.git.joerg.sommer@navimatix.de
State New
Headers show
Series [kirkstone] tcpdump: Remove patch fuzz from CVE-2024-2397 | expand

Commit Message

Jörg Sommer July 31, 2025, 8:28 p.m. UTC 
From: Jörg Sommer <joerg.sommer@navimatix.de>

Applying patch CVE-2024-2397.patch
patching file print-ppp.c
Hunk #1 succeeded at 42 with fuzz 2 (offset 5 lines).
Hunk #2 succeeded at 1365 (offset 5 lines).
Hunk #3 succeeded at 1372 (offset 5 lines).
Hunk #4 succeeded at 1397 (offset 5 lines).
Hunk #5 succeeded at 1447 (offset 5 lines).

Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 .../tcpdump/tcpdump/CVE-2024-2397.patch            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Gyorgy Sarvari Sept. 4, 2025, 6:44 p.m. UTC | #1 
Just a small note: this was a few days earlier submitted also by others:
https://lists.openembedded.org/g/openembedded-devel/message/118535

On 7/31/25 22:28, Jörg Sommer via lists.openembedded.org wrote:
> From: Jörg Sommer <joerg.sommer@navimatix.de>
>
> Applying patch CVE-2024-2397.patch
> patching file print-ppp.c
> Hunk #1 succeeded at 42 with fuzz 2 (offset 5 lines).
> Hunk #2 succeeded at 1365 (offset 5 lines).
> Hunk #3 succeeded at 1372 (offset 5 lines).
> Hunk #4 succeeded at 1397 (offset 5 lines).
> Hunk #5 succeeded at 1447 (offset 5 lines).
>
> Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
> ---
>  .../tcpdump/tcpdump/CVE-2024-2397.patch            | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/CVE-2024-2397.patch b/meta-networking/recipes-support/tcpdump/tcpdump/CVE-2024-2397.patch
> index 169ec6be70..142b059ea5 100644
> --- a/meta-networking/recipes-support/tcpdump/tcpdump/CVE-2024-2397.patch
> +++ b/meta-networking/recipes-support/tcpdump/tcpdump/CVE-2024-2397.patch
> @@ -33,16 +33,16 @@ diff --git a/print-ppp.c b/print-ppp.c
>  index 2cf06c363..9aed23eb9 100644
>  --- a/print-ppp.c
>  +++ b/print-ppp.c
> -@@ -37,6 +37,8 @@
> - 
> - #include "netdissect-stdinc.h"
> +@@ -42,6 +42,8 @@
> + #include <net/if_ppp.h>
> + #endif
>   
>  +#include <stdlib.h>
>  +
>   #include "netdissect.h"
>   #include "extract.h"
>   #include "addrtoname.h"
> -@@ -1358,7 +1360,6 @@ ppp_hdlc(netdissect_options *ndo,
> +@@ -1363,7 +1365,6 @@ ppp_hdlc(netdissect_options *ndo,
>   	u_char *b, *t, c;
>   	const u_char *s;
>   	u_int i, proto;
> @@ -50,7 +50,7 @@ index 2cf06c363..9aed23eb9 100644
>   
>   	if (caplen == 0)
>   		return;
> -@@ -1366,9 +1367,11 @@ ppp_hdlc(netdissect_options *ndo,
> +@@ -1371,9 +1372,11 @@ ppp_hdlc(netdissect_options *ndo,
>           if (length == 0)
>                   return;
>   
> @@ -65,7 +65,7 @@ index 2cf06c363..9aed23eb9 100644
>   
>   	/*
>   	 * Unescape all the data into a temporary, private, buffer.
> -@@ -1389,13 +1392,15 @@ ppp_hdlc(netdissect_options *ndo,
> +@@ -1394,13 +1397,15 @@ ppp_hdlc(netdissect_options *ndo,
>   	}
>   
>   	/*
> @@ -87,7 +87,7 @@ index 2cf06c363..9aed23eb9 100644
>   	length = ND_BYTES_AVAILABLE_AFTER(b);
>   
>           /* now lets guess about the payload codepoint format */
> -@@ -1437,13 +1442,11 @@ ppp_hdlc(netdissect_options *ndo,
> +@@ -1442,13 +1447,11 @@ ppp_hdlc(netdissect_options *ndo,
>           }
>   
>   cleanup:
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#118818): https://lists.openembedded.org/g/openembedded-devel/message/118818
> Mute This Topic: https://lists.openembedded.org/mt/114473441/6084445
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [skandigraun@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/CVE-2024-2397.patch b/meta-networking/recipes-support/tcpdump/tcpdump/CVE-2024-2397.patch
index 169ec6be70..142b059ea5 100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump/CVE-2024-2397.patch
+++ b/meta-networking/recipes-support/tcpdump/tcpdump/CVE-2024-2397.patch
@@ -33,16 +33,16 @@  diff --git a/print-ppp.c b/print-ppp.c
 index 2cf06c363..9aed23eb9 100644
 --- a/print-ppp.c
 +++ b/print-ppp.c
-@@ -37,6 +37,8 @@
- 
- #include "netdissect-stdinc.h"
+@@ -42,6 +42,8 @@
+ #include <net/if_ppp.h>
+ #endif
  
 +#include <stdlib.h>
 +
  #include "netdissect.h"
  #include "extract.h"
  #include "addrtoname.h"
-@@ -1358,7 +1360,6 @@ ppp_hdlc(netdissect_options *ndo,
+@@ -1363,7 +1365,6 @@ ppp_hdlc(netdissect_options *ndo,
  	u_char *b, *t, c;
  	const u_char *s;
  	u_int i, proto;
@@ -50,7 +50,7 @@  index 2cf06c363..9aed23eb9 100644
  
  	if (caplen == 0)
  		return;
-@@ -1366,9 +1367,11 @@ ppp_hdlc(netdissect_options *ndo,
+@@ -1371,9 +1372,11 @@ ppp_hdlc(netdissect_options *ndo,
          if (length == 0)
                  return;
  
@@ -65,7 +65,7 @@  index 2cf06c363..9aed23eb9 100644
  
  	/*
  	 * Unescape all the data into a temporary, private, buffer.
-@@ -1389,13 +1392,15 @@ ppp_hdlc(netdissect_options *ndo,
+@@ -1394,13 +1397,15 @@ ppp_hdlc(netdissect_options *ndo,
  	}
  
  	/*
@@ -87,7 +87,7 @@  index 2cf06c363..9aed23eb9 100644
  	length = ND_BYTES_AVAILABLE_AFTER(b);
  
          /* now lets guess about the payload codepoint format */
-@@ -1437,13 +1442,11 @@ ppp_hdlc(netdissect_options *ndo,
+@@ -1442,13 +1447,11 @@ ppp_hdlc(netdissect_options *ndo,
          }
  
  cleanup: