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

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

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
rfcomm.c        1.120           1.121=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Do not dereference rfcomm in rfcomm_disconnect_ind() if it is NULL.


The diff of the modified file(s):

--- rfcomm.c	2001/09/28 14:54:15	1.120
+++ rfcomm.c	2001/10/04 14:52:59	1.121
@@ -972,13 +972,11 @@
=20
 	DSYS(FNC"remote cid %d\n", l2cap->remote_cid);
=20
-	rfcomm =3D ((rfcomm_con*) l2cap->upper_con);
-
+	if ((rfcomm =3D (rfcomm_con*)l2cap->upper_con)) {
 	/* This l2cap connection is going down, remove all rfcomm cons=20
 	   and notify upper tty */
=20
-	if (!l2cap->link_up)
-	{
+		if (!l2cap->link_up) {
 		DSYS(FNC"Baseband is down, reset this RFCOMM session\n");
 #ifdef __KERNEL__
 		bt_unregister_rfcomm(rfcomm->line);
@@ -987,6 +985,7 @@
 	}
=20
 	rfcomm_reset_con(rfcomm->line);
+	}
=20
 	/* always try to send back rsp (if link is down con is deleted) */
 	if (l2ca_disconnect_rsp(l2cap)) {