commit | 27473b620ab7b54132652f572417bde380fa7dc8 | [log] [tgz] |
---|---|---|
author | Maciej Żenczykowski <maze@google.com> | Mon Jan 29 11:24:37 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 29 11:24:37 2024 +0000 |
tree | 93baf34233822a369a97ebecc19e554231a2acd0 | |
parent | fef1ac30790d312fe4b055e92bf149a239ed2ab2 [diff] | |
parent | 7412936a8cb66ce025b32db066fe294ad6d06be3 [diff] |
Merge "Add SOCK_CLOEXEC to NetlinkUtils.netlinkSocketForProto" into main am: 7412936a8c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2929737 Change-Id: Ic5ac59e59e0bcc9dd1d288f2299f44ccb14185ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java b/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java index f735e46..81adcd6 100644 --- a/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java +++ b/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java
@@ -230,7 +230,7 @@ * @throws ErrnoException if the FileDescriptor not connect to be created successfully */ public static FileDescriptor netlinkSocketForProto(int nlProto) throws ErrnoException { - final FileDescriptor fd = Os.socket(AF_NETLINK, SOCK_DGRAM, nlProto); + final FileDescriptor fd = Os.socket(AF_NETLINK, SOCK_DGRAM | SOCK_CLOEXEC, nlProto); Os.setsockoptInt(fd, SOL_SOCKET, SO_RCVBUF, SOCKET_RECV_BUFSIZE); return fd; }