diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-16 16:41:05 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-16 16:41:05 +0000 |
| commit | 3c01c6b04007d09341bf51e2938714ae8a10276e (patch) | |
| tree | ac224f88b4e396cf812f77201b51af32623b14aa | |
| parent | 412a7e50a9e9b88bee3f4154e49df7d975377194 (diff) | |
| parent | 9e60459d0b5fe695388257fc36acb9ac4dee804e (diff) | |
| download | netd-pie-release-2.tar.gz | |
Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 4793680, 4793681, 4793581, 4793582, 4793625, 4793626, 4793627, 4793628, 4793700, 4793701, 4793702, 4793703, 4793704, 4793705, 4793661, 4793720, 4793721, 4793722, 4793723, 4793724, 4793725, 4793726, 4793727, 4793728, 4793583, 4793740, 4793760, 4793662, 4793780, 4793729] into pi-release-2android-9.0.0_r18android-9.0.0_r10pie-release-2pie-r2-s2-release
Change-Id: I7961ffd299778c9b0f4d0f36b059c3406e89454d
| -rw-r--r-- | server/XfrmController.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/XfrmController.cpp b/server/XfrmController.cpp index b9a5a415..6f7bf2f2 100644 --- a/server/XfrmController.cpp +++ b/server/XfrmController.cpp @@ -436,7 +436,7 @@ netdutils::Status XfrmController::ipSecSetEncapSocketOwner(const android::base:: } int optval; - socklen_t optlen; + socklen_t optlen = sizeof(optval); netdutils::Status status = getSyscallInstance().getsockopt(Fd(socket), IPPROTO_UDP, UDP_ENCAP, &optval, &optlen); if (status != netdutils::status::ok) { |