diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-20 15:25:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-20 15:25:37 -0700 |
| commit | d3d3cf05eda861d807de539cac25bcefee0f9659 (patch) | |
| tree | 8ea562077369b97700ebe6af02906690a788bf51 /net/llc | |
| parent | a6db522c9399f69ff705c8afae069b5a74a8ea6b (diff) | |
| parent | 18bc89aa25fbfcf467f4ce67f76c7b9893404cac (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[EBTABLES]: Clean up vmalloc usage in net/bridge/netfilter/ebtables.c
[NET]: Add skb->truesize assertion checking.
[TCP]: Account skb overhead in tcp_fragment
[SUNGEM]: Marvell PHY suspend.
[LLC]: Use pskb_trim_rcsum() in llc_fixup_skb().
[NET]: sockfd_lookup_light() returns random error for -EBADFD
Diffstat (limited to 'net/llc')
| -rw-r--r-- | net/llc/llc_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c index 8f3addf0724..d62e0f9b9da 100644 --- a/net/llc/llc_input.c +++ b/net/llc/llc_input.c @@ -118,7 +118,8 @@ static inline int llc_fixup_skb(struct sk_buff *skb) u16 pdulen = eth_hdr(skb)->h_proto, data_size = ntohs(pdulen) - llc_len; - skb_trim(skb, data_size); + if (unlikely(pskb_trim_rcsum(skb, data_size))) + return 0; } return 1; } |