git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net/x25: fix called/calling length calculation in x25_parse_address_block
[sfrench/cifs-2.6.git]
/
net
/
x25
/
af_x25.c
diff --git
a/net/x25/af_x25.c
b/net/x25/af_x25.c
index d49aa79b79970d403b5c165d4000b2aa1d493442..5226a7f43050bc783782a09f9782b7d2a2eb430c 100644
(file)
--- a/
net/x25/af_x25.c
+++ b/
net/x25/af_x25.c
@@
-100,7
+100,7
@@
int x25_parse_address_block(struct sk_buff *skb,
}
len = *skb->data;
- needed = 1 + (
len >> 4) + (len & 0x0f)
;
+ needed = 1 + (
(len >> 4) + (len & 0x0f) + 1) / 2
;
if (!pskb_may_pull(skb, needed)) {
/* packet is too short to hold the addresses it claims