commit a632a66b81ee4b1db65d0cf64b4ce525f56214ff
author Myles Watson <mylesgw@google.com> Thu Feb 04 12:54:28 2021 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Fri Mar 19 00:00:31 2021 +0000
tree 77fbf78da65f599acd2224c4948a9f78b1859d80
parent 2af6ad6cd3e2b6f1dd9f210cb4b27e98e5f6db2d

btif: Return after closing the socket

Bug: 175686168
Test: poc in bug
Tag: #security
Change-Id: I3af19be9bee9535e67e4dcbc2584d2084656b817
Merged-In: I3af19be9bee9535e67e4dcbc2584d2084656b817
(cherry picked from commit ff82e7d429902405e7e0a780f955a5b9ef2d9e1b)

btif/src/btif_sock_l2cap.cc

diff --git a/btif/src/btif_sock_l2cap.cc b/btif/src/btif_sock_l2cap.cc
index 105d5a1..fa59d87 100644
--- a/btif/src/btif_sock_l2cap.cc
+++ b/btif/src/btif_sock_l2cap.cc
@@ -726,6 +726,7 @@
                << ": unable to push data to socket - closing  fixed channel";
       BTA_JvL2capCloseLE(sock->handle);
       btsock_l2cap_free_l(sock);
+      return;
     }
 
   } else {
@@ -744,6 +745,7 @@
                    << ": unable to push data to socket - closing channel";
           BTA_JvL2capClose(sock->handle);
           btsock_l2cap_free_l(sock);
+          return;
         }
       }
     }