summaryrefslogtreecommitdiffstats
path: root/net/x25/x25_in.c
diff options
context:
space:
mode:
authorandrew hendry <andrew.hendry@gmail.com>2010-11-03 13:54:53 +0100
committerDavid S. Miller <davem@davemloft.net>2010-11-04 02:50:50 +0100
commita6331d6f9a4298173b413cf99a40cc86a9d92c37 (patch)
treeb665efee7dae4472e0f4521bbdd3aef626813ba6 /net/x25/x25_in.c
parentnet dst: fix percpu_counter list corruption and poison overwritten (diff)
downloadlinux-a6331d6f9a4298173b413cf99a40cc86a9d92c37.tar.xz
linux-a6331d6f9a4298173b413cf99a40cc86a9d92c37.zip
memory corruption in X.25 facilities parsing
Signed-of-by: Andrew Hendry <andrew.hendry@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25/x25_in.c')
-rw-r--r--net/x25/x25_in.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
index 63178961efac..f729f022be69 100644
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -119,6 +119,8 @@ static int x25_state1_machine(struct sock *sk, struct sk_buff *skb, int frametyp
&x25->vc_facil_mask);
if (len > 0)
skb_pull(skb, len);
+ else
+ return -1;
/*
* Copy any Call User Data.
*/