Re: [PATCH] make happy cracking message more verbose

[Patrick McHardy <kaber@trash.net>]

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

Maciej Soltysiak wrote:

>>It turned out to be an unrelated bug, located
>>in skb_copy_expand.
>>    
>>
>Hmm, is there a fix ? I would like to test it, and see if
>it still happens on my box.
>  
>

Yes it's attached to this mail. It's also in davem's tree
now, but IIRC the bitkeeper repositories are down until
the weekend.

Best regards,
Patrick


[-- Attachment #2: 2.6-skb_copy_expand.diff --]
[-- Type: text/plain, Size: 1075 bytes --]

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1413  -> 1.1414 
#	   net/core/skbuff.c	1.32    -> 1.33   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/11/06	kaber@trash.net	1.1414
# Fix skb_copy_expand offset calculation
# --------------------------------------------
#
diff -Nru a/net/core/skbuff.c b/net/core/skbuff.c
--- a/net/core/skbuff.c	Thu Nov  6 17:34:55 2003
+++ b/net/core/skbuff.c	Thu Nov  6 17:34:55 2003
@@ -595,10 +595,10 @@
 
 	head_copy_len = skb_headroom(skb);
 	head_copy_off = 0;
-	if (newheadroom < head_copy_len) {
-		head_copy_off = head_copy_len - newheadroom;
+	if (newheadroom <= head_copy_len)
 		head_copy_len = newheadroom;
-	}
+	else
+		head_copy_off = newheadroom - head_copy_len;
 
 	/* Copy the linear header and data. */
 	if (skb_copy_bits(skb, -head_copy_len, n->head + head_copy_off,