From 38fd0f8001cceea88b879e52213f3f1a1033098f Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Mon, 21 Jun 2021 14:21:49 -0700
Subject: Upgrade rust/crates/vsock to 0.2.4

Test: make
Change-Id: I2b8243e2b6b10866c9778ff4d1d3050faee2f62a
---
 .cargo_vcs_info.json | 2 +-
 Android.bp           | 3 ++-
 Cargo.toml           | 2 +-
 Cargo.toml.orig      | 2 +-
 METADATA             | 8 ++++----
 src/lib.rs           | 3 ++-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index c3a6da8..4fc9144 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "c24bde75d75afb29563cc465f4c3e2cedfea69b9"
+    "sha1": "56852d4006efce337875594e6a21ec49f0fc9c89"
   }
 }
diff --git a/Android.bp b/Android.bp
index 36b9fb8..5e4e836 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --dependencies.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: ["external_rust_crates_vsock_license"],
@@ -32,5 +33,5 @@ rust_library {
 // dependent_library ["feature_list"]
 //   bitflags-1.2.1 "default"
 //   cfg-if-1.0.0
-//   libc-0.2.86 "default,extra_traits,std"
+//   libc-0.2.97 "default,extra_traits,std"
 //   nix-0.19.1
diff --git a/Cargo.toml b/Cargo.toml
index c4b49fa..be4c916 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "vsock"
-version = "0.2.3"
+version = "0.2.4"
 authors = ["fsyncd", "rust-vsock"]
 exclude = ["test_fixture"]
 description = "Virtio socket support for Rust"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index afe8103..aa90128 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "vsock"
-version = "0.2.3"
+version = "0.2.4"
 authors = ["fsyncd", "rust-vsock"]
 description = "Virtio socket support for Rust"
 repository = "https://github.com/rust-vsock/vsock-rs"
diff --git a/METADATA b/METADATA
index 1f3b1c3..1bb714c 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/vsock/vsock-0.2.3.crate"
+    value: "https://static.crates.io/crates/vsock/vsock-0.2.4.crate"
   }
-  version: "0.2.3"
+  version: "0.2.4"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 2
-    day: 9
+    month: 6
+    day: 21
   }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 82d5092..065ca57 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -134,10 +134,11 @@ impl VsockListener {
         };
         let mut vsock_addr_len = size_of::<sockaddr_vm>() as socklen_t;
         let socket = unsafe {
-            accept(
+            accept4(
                 self.socket,
                 &mut vsock_addr as *mut _ as *mut sockaddr,
                 &mut vsock_addr_len,
+                SOCK_CLOEXEC,
             )
         };
         if socket < 0 {
-- 
cgit v1.2.3