From 7896a090fe2b23961d255effa44eb1ebc74b2450 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Tue, 24 Mar 2009 03:27:48 +0000
Subject: [PATCH] --- yaml --- r: 135517 b: refs/heads/master c:
 fb8585fc3f9b39153e0bdaf03f00a02dde9c03c6 h: refs/heads/master i:   135515:
 be47ff6a8529ff11d87bc0d84bc6216edd26377d v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/s390/net/ctcm_fsms.c | 5 ++---
 trunk/drivers/s390/net/ctcm_main.c | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 747addbcdb09..652f8330f725 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a05d1404d91efd63f0654a4bf59b8803c32efdd
+refs/heads/master: fb8585fc3f9b39153e0bdaf03f00a02dde9c03c6
diff --git a/trunk/drivers/s390/net/ctcm_fsms.c b/trunk/drivers/s390/net/ctcm_fsms.c
index f29c7086fc19..4ded9ac2c5ef 100644
--- a/trunk/drivers/s390/net/ctcm_fsms.c
+++ b/trunk/drivers/s390/net/ctcm_fsms.c
@@ -410,9 +410,8 @@ static void chx_rx(fsm_instance *fi, int event, void *arg)
 		priv->stats.rx_length_errors++;
 						goto again;
 	}
-	block_len -= 2;
-	if (block_len > 0) {
-		*((__u16 *)skb->data) = block_len;
+	if (block_len > 2) {
+		*((__u16 *)skb->data) = block_len - 2;
 		ctcm_unpack_skb(ch, skb);
 	}
  again:
diff --git a/trunk/drivers/s390/net/ctcm_main.c b/trunk/drivers/s390/net/ctcm_main.c
index 59ce7fb73089..a7a25383db76 100644
--- a/trunk/drivers/s390/net/ctcm_main.c
+++ b/trunk/drivers/s390/net/ctcm_main.c
@@ -105,7 +105,8 @@ void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb)
 			return;
 		}
 		pskb->protocol = ntohs(header->type);
-		if (header->length <= LL_HEADER_LENGTH) {
+		if ((header->length <= LL_HEADER_LENGTH) ||
+		    (len <= LL_HEADER_LENGTH)) {
 			if (!(ch->logflags & LOG_FLAG_ILLEGALSIZE)) {
 				CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR,
 					"%s(%s): Illegal packet size %d(%d,%d)"