patch-2.3.14 linux/drivers/isdn/hisax/isdnl1.c

• Lines: 69
• Date: Sun Aug 15 11:49:08 1999
• Orig file: v2.3.13/linux/drivers/isdn/hisax/isdnl1.c
• Orig date: Wed May 26 16:55:40 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/isdn/hisax/isdnl1.c linux/drivers/isdn/hisax/isdnl1.c
@@ -1,4 +1,4 @@
-/* $Id: isdnl1.c,v 2.31 1998/11/15 23:54:56 keil Exp $
+/* $Id: isdnl1.c,v 2.34 1999/07/09 13:50:15 keil Exp $
 
  * isdnl1.c     common low level stuff for Siemens Chipsetbased isdn cards
  *              based on the teles driver from Jan den Ouden
@@ -15,6 +15,15 @@
  *
  *
  * $Log: isdnl1.c,v $
+ * Revision 2.34  1999/07/09 13:50:15  keil
+ * remove unused variable
+ *
+ * Revision 2.33  1999/07/09 13:34:33  keil
+ * remove debug code
+ *
+ * Revision 2.32  1999/07/01 08:11:47  keil
+ * Common HiSax version for 2.0, 2.1, 2.2 and 2.3 kernel
+ *
  * Revision 2.31  1998/11/15 23:54:56  keil
  * changes from 2.0
  *
@@ -120,7 +129,7 @@
  *
  */
 
-const char *l1_revision = "$Revision: 2.31 $";
+const char *l1_revision = "$Revision: 2.34 $";
 
 #define __NO_VERSION__
 #include "hisax.h"
@@ -298,9 +307,18 @@
 			Logl2Frame(cs, skb, "PH_DATA", 1);
 #endif
 		stptr = cs->stlist;
+		if (skb->len<3) {
+			debugl1(cs, "D-channel frame too short(%d)",skb->len);
+			idev_kfree_skb(skb, FREE_READ);
+			return;
+		}
+		if ((skb->data[0] & 1) || !(skb->data[1] &1)) {
+			debugl1(cs, "D-channel frame wrong EA0/EA1");
+			idev_kfree_skb(skb, FREE_READ);
+			return;
+		}
 		sapi = skb->data[0] >> 2;
 		tei = skb->data[1] >> 1;
-
 		if (cs->debug & DEB_DLOG_HEX)
 			LogFrame(cs, skb->data, skb->len);
 		if (cs->debug & DEB_DLOG_VERBOSE)
@@ -323,7 +341,7 @@
 					stptr = stptr->next;
 				}
 			}
-			dev_kfree_skb(skb);
+			idev_kfree_skb(skb, FREE_READ);
 		} else if (sapi == CTRL_SAPI) { /* sapi 0 */
 			found = 0;
 			while (stptr != NULL)
@@ -334,7 +352,7 @@
 				} else
 					stptr = stptr->next;
 			if (!found)
-				dev_kfree_skb(skb);
+				idev_kfree_skb(skb, FREE_READ);
 		}
 	}
 }