| commit | ecdd641b0faddb243ed00c6bf96a10a291e17015 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Apr 11 08:53:10 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 11 08:53:10 2024 +0000 |
| tree | 8ec4ba8484fb0fa931ebc858864eb1ec4d7bc6c9 | |
| parent | 167610880012175bcfe0a9120c5b04fb6e2d5cd4 [diff] | |
| parent | fad8a7b6d073b0eb233af4a299eaf2baabd24610 [diff] |
Merge "[Thread] make sure buffer size is enough" into main am: 82bb6fcfdc am: fad8a7b6d0 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3039092 Change-Id: I549ffb080560c5385c36111f72f6a7314a088971 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);