[PATCH 1/1] skb->tail can be offset

[PATCH 1/1] skb->tail can be offset

[Serge E. Hallyn]

Needed for socket c/r on 64-bit arches.

Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 net/checkpoint.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/checkpoint.c b/net/checkpoint.c
index c6b6341..ee13050 100644
--- a/net/checkpoint.c
+++ b/net/checkpoint.c
@@ -97,19 +97,19 @@ static void sock_record_header_info(struct sk_buff *skb,
 	h->mac_len = skb->mac_len;
 	h->skb_len = skb->len;
 	h->hdr_len = skb->data - skb->head;
-	h->lin_len = ((unsigned long)skb->tail - (unsigned long)skb->head);
 	h->frg_len = skb->data_len;
-
 	h->data_offset = (skb->data - skb->head);
 
 #ifdef NET_SKBUFF_DATA_USES_OFFSET
 	h->transport_header = skb->transport_header;
 	h->network_header = skb->network_header;
 	h->mac_header = skb->mac_header;
+	h->lin_len = (unsigned long) skb->tail;
 #else
 	h->transport_header = skb->transport_header - skb->head;
 	h->network_header = skb->network_header - skb->head;
 	h->mac_header = skb->mac_header - skb->head;
+	h->lin_len = ((unsigned long) skb->tail - (unsigned long) skb->head);
 #endif
 
 	memcpy(h->cb, skb->cb, sizeof(skb->cb));
-- 
1.6.0.6

Re: [PATCH 1/1] skb->tail can be offset

[Oren Laadan]

Nice catch -- applied.

Serge E. Hallyn wrote:
> Needed for socket c/r on 64-bit arches.
> 
> Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  net/checkpoint.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/checkpoint.c b/net/checkpoint.c
> index c6b6341..ee13050 100644
> --- a/net/checkpoint.c
> +++ b/net/checkpoint.c
> @@ -97,19 +97,19 @@ static void sock_record_header_info(struct sk_buff *skb,
>  	h->mac_len = skb->mac_len;
>  	h->skb_len = skb->len;
>  	h->hdr_len = skb->data - skb->head;
> -	h->lin_len = ((unsigned long)skb->tail - (unsigned long)skb->head);
>  	h->frg_len = skb->data_len;
> -
>  	h->data_offset = (skb->data - skb->head);
>  
>  #ifdef NET_SKBUFF_DATA_USES_OFFSET
>  	h->transport_header = skb->transport_header;
>  	h->network_header = skb->network_header;
>  	h->mac_header = skb->mac_header;
> +	h->lin_len = (unsigned long) skb->tail;
>  #else
>  	h->transport_header = skb->transport_header - skb->head;
>  	h->network_header = skb->network_header - skb->head;
>  	h->mac_header = skb->mac_header - skb->head;
> +	h->lin_len = ((unsigned long) skb->tail - (unsigned long) skb->head);
>  #endif
>  
>  	memcpy(h->cb, skb->cb, sizeof(skb->cb));