diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 11:03:35 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 11:03:35 -0400 |
| commit | 2bf6f675fa1a0f80b21aff20e6c21e87d6a7c9c9 (patch) | |
| tree | ef49d741211dcc4f38636b5c422c9c346da09adf /net/x25/x25_link.c | |
| parent | 5762c20593b6b959f1470dc6f1ff4ca4d9570f8d (diff) | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
Merge commit 'v3.1' into devicetree/next
Diffstat (limited to 'net/x25/x25_link.c')
| -rw-r--r-- | net/x25/x25_link.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c index 037958ff8eed..4acacf3c6617 100644 --- a/net/x25/x25_link.c +++ b/net/x25/x25_link.c | |||
| @@ -90,6 +90,9 @@ void x25_link_control(struct sk_buff *skb, struct x25_neigh *nb, | |||
| 90 | break; | 90 | break; |
| 91 | 91 | ||
| 92 | case X25_DIAGNOSTIC: | 92 | case X25_DIAGNOSTIC: |
| 93 | if (!pskb_may_pull(skb, X25_STD_MIN_LEN + 4)) | ||
| 94 | break; | ||
| 95 | |||
| 93 | printk(KERN_WARNING "x25: diagnostic #%d - %02X %02X %02X\n", | 96 | printk(KERN_WARNING "x25: diagnostic #%d - %02X %02X %02X\n", |
| 94 | skb->data[3], skb->data[4], | 97 | skb->data[3], skb->data[4], |
| 95 | skb->data[5], skb->data[6]); | 98 | skb->data[5], skb->data[6]); |