| commit | fad8a7b6d073b0eb233af4a299eaf2baabd24610 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Apr 11 08:33:14 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 11 08:33:14 2024 +0000 |
| tree | db9d65ed472e741119335c4aba1af9240cdc5fd7 | |
| parent | 30cf023827490b5e6fc51c9061159118015b109d [diff] | |
| parent | 82bb6fcfdc2e15aa90179f4a4021db29bcbd0dfc [diff] |
Merge "[Thread] make sure buffer size is enough" into main am: 82bb6fcfdc Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3039092 Change-Id: Ie1372d5e4f7152426fdb9a6619617ac2d67e5895 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/threadnetwork/aidl/default/socket_interface.cpp b/threadnetwork/aidl/default/socket_interface.cpp index 7bdf39a..0544502 100644 --- a/threadnetwork/aidl/default/socket_interface.cpp +++ b/threadnetwork/aidl/default/socket_interface.cpp
@@ -23,6 +23,7 @@ #include "socket_interface.hpp" #include <errno.h> +#include <linux/limits.h> #include <openthread/logging.h> #include <sys/inotify.h> #include <sys/socket.h> @@ -273,7 +274,7 @@ } if (FD_ISSET(inotifyFd, &fds)) { - char buffer[sizeof(struct inotify_event)]; + char buffer[sizeof(struct inotify_event) + NAME_MAX + 1]; ssize_t bytesRead = read(inotifyFd, buffer, sizeof(buffer)); VerifyOrDie(bytesRead >= 0, OT_EXIT_ERROR_ERRNO);