CVS: The file 'linux/drivers/char/bluetooth/l2cap.c' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
l2cap.c         1.97            1.98=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Do not dereference con if it is NULL in process_request()
(thanks to Eric Muehlhausen).


The diff of the modified file(s):

--- l2cap.c	2001/04/10 12:27:10	1.97
+++ l2cap.c	2001/04/11 11:16:30	1.98
@@ -696,7 +696,7 @@
 		if ((con =3D check_remote_cid(hci_handle,=20
 					  conreq->src_cid)) =3D=3D NULL) {
 			D_ERR(FNC"couldn't find l2cap connection\n");
-			l2cap_cmdrej(con->hci_hdl, CMDREJ_INVALIDCID,
+			l2cap_cmdrej(hci_handle, CMDREJ_INVALIDCID,
 				     "Invalid CID", 13);
 			return;
 		}
@@ -740,7 +740,7 @@
 		if ((con =3D get_lcon(confreq->dst_cid)) =3D=3D NULL) {
 			D_ERR("Couldn't find local CID\n");
 			/* send back response ? */
-			l2cap_cmdrej(con->hci_hdl, CMDREJ_INVALIDCID, NULL, 0);
+			l2cap_cmdrej(hci_handle, CMDREJ_INVALIDCID, NULL, 0);
 			return;
 		}
=20=09=09
@@ -1246,8 +1246,6 @@
 }
=20
=20
-
-
 /*******************************************************************/
 /*-------------------------- EVENTS -------------------------------*/
 /*******************************************************************/
@@ -1478,8 +1476,7 @@
 	if (len > (con->local_mtu)) {
 		DSYS("l2cap process_frame : len > local_mtu (%d/%d)\n",=20
 		     len- L2CAP_HDRSIZE, con->local_mtu);
-		l2cap_cmdrej(con->hci_hdl, CMDREJ_MTUEXCEEDED,
-			     NULL, 0);
+		l2cap_cmdrej(con->hci_hdl, CMDREJ_MTUEXCEEDED, NULL, 0);
 		return;
 	}=20
=20