Skip to content

Commit

Permalink
[TCP]: Account skb overhead in tcp_fragment
Browse files Browse the repository at this point in the history
Make sure that we get the full sizeof(struct sk_buff)
plus the data size accounted for in skb->truesize.

This will create invariants that will allow adding
assertion checks on skb->truesize.

Signed-off-by: Herbert Xu <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
herbertx authored and davem330 committed Apr 20, 2006
1 parent d47f364 commit b60b49e
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions net/ipv4/tcp_output.c
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss
struct tcp_sock *tp = tcp_sk(sk);
struct sk_buff *buff;
int nsize, old_factor;
int nlen;
u16 flags;

BUG_ON(len > skb->len);
Expand All @@ -552,8 +553,10 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss
if (buff == NULL)
return -ENOMEM; /* We'll just try again later. */

buff->truesize = skb->len - len;
skb->truesize -= buff->truesize;
sk_charge_skb(sk, buff);
nlen = skb->len - len - nsize;
buff->truesize += nlen;
skb->truesize -= nlen;

/* Correct the sequence numbers. */
TCP_SKB_CB(buff)->seq = TCP_SKB_CB(skb)->seq + len;
Expand Down Expand Up @@ -1039,7 +1042,8 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len,
if (unlikely(buff == NULL))
return -ENOMEM;

buff->truesize = nlen;
sk_charge_skb(sk, buff);
buff->truesize += nlen;
skb->truesize -= nlen;

/* Correct the sequence numbers. */
Expand Down

0 comments on commit b60b49e

Please sign in to comment.