From 47eeaa0e9b7905b8703fc8c75142219d2c9c0dcf Mon Sep 17 00:00:00 2001
From: Matthew Daley <mattjd@gmail.com>
Date: Fri, 14 Oct 2011 18:45:05 +0000
Subject: [PATCH] --- yaml --- r: 264374 b: refs/heads/master c:
 7f81e25befdfb3272345a2e775f520e1d515fa20 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/x25/af_x25.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e18d3291500a..a524128ebfd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb101ed2c3c7c0224d16953fe77bfb9d6c2cb9df
+refs/heads/master: 7f81e25befdfb3272345a2e775f520e1d515fa20
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
index aa567b09ea9a..5f03e4ea65bf 100644
--- a/trunk/net/x25/af_x25.c
+++ b/trunk/net/x25/af_x25.c
@@ -295,7 +295,8 @@ static struct sock *x25_find_listener(struct x25_address *addr,
 			 * Found a listening socket, now check the incoming
 			 * call user data vs this sockets call user data
 			 */
-			if(skb->len > 0 && x25_sk(s)->cudmatchlength > 0) {
+			if (x25_sk(s)->cudmatchlength > 0 &&
+				skb->len >= x25_sk(s)->cudmatchlength) {
 				if((memcmp(x25_sk(s)->calluserdata.cuddata,
 					skb->data,
 					x25_sk(s)->cudmatchlength)) == 0) {