commit fe9cb04ec15e652df433e5656871bea50be30524
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 10 19:42:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 10 19:42:36 2017 +0000
tree cf3c365919eda1444428dba7c4b2dc2bd0c9f499
parent 6b75bccdce8411976553749ed31955eadda70cf7
parent 131854f401d031bd7605214f9b59a81972a2a1bc

Merge "Add the error code "OPERATION_NOT_ALLOWED" and log the error."

bluetooth/1.0/default/OWNERS

diff --git a/bluetooth/1.0/default/OWNERS b/bluetooth/1.0/default/OWNERS
new file mode 100644
index 0000000..5df5bfe
--- /dev/null
+++ b/bluetooth/1.0/default/OWNERS
@@ -0,0 +1,3 @@
+eisenbach@google.com
+mylesgw@google.com
+pavlin@google.com

bluetooth/1.0/default/vendor_interface.cc

diff --git a/bluetooth/1.0/default/vendor_interface.cc b/bluetooth/1.0/default/vendor_interface.cc
index ffc283e..15b6c74 100644
--- a/bluetooth/1.0/default/vendor_interface.cc
+++ b/bluetooth/1.0/default/vendor_interface.cc
@@ -226,6 +226,11 @@
   int fd_list[CH_MAX] = {0};
   int fd_count = lib_interface_->op(BT_VND_OP_USERIAL_OPEN, &fd_list);
 
+  if (fd_count < 1 || fd_count > CH_MAX - 1) {
+    ALOGE("%s: fd_count %d is invalid!", __func__, fd_count);
+    return false;
+  }
+
   for (int i = 0; i < fd_count; i++) {
     if (fd_list[i] == INVALID_FD) {
       ALOGE("%s: fd %d is invalid!", __func__, fd_list[i]);

nfc/1.0/default/OWNERS

diff --git a/nfc/1.0/default/OWNERS b/nfc/1.0/default/OWNERS
new file mode 100644
index 0000000..984e5f9
--- /dev/null
+++ b/nfc/1.0/default/OWNERS
@@ -0,0 +1,2 @@
+eisenbach@google.com
+kandoiruchi@google.com