Blame 0076-usernsd-UNS_FDOUT-should-not-require-an-input-descri.patch

Radostin Stoyanov 46abdd7
From fc1e7788ce1cba57afc230c6219d570f5d3074ae Mon Sep 17 00:00:00 2001
Radostin Stoyanov 46abdd7
From: Andrei Vagin <avagin@google.com>
Radostin Stoyanov 46abdd7
Date: Tue, 14 Dec 2021 08:19:16 -0800
Radostin Stoyanov 46abdd7
Subject: [PATCH 076/120] usernsd: UNS_FDOUT should not require an input
Radostin Stoyanov 46abdd7
 descriptor
Radostin Stoyanov 46abdd7
Radostin Stoyanov 46abdd7
UNS_FDOUT means only that a userns call will return a file descriptor.
Radostin Stoyanov 46abdd7
Radostin Stoyanov 46abdd7
Signed-off-by: Andrei Vagin <avagin@google.com>
Radostin Stoyanov 46abdd7
---
Radostin Stoyanov 46abdd7
 criu/namespaces.c | 5 -----
Radostin Stoyanov 46abdd7
 1 file changed, 5 deletions(-)
Radostin Stoyanov 46abdd7
Radostin Stoyanov 46abdd7
diff --git a/criu/namespaces.c b/criu/namespaces.c
Radostin Stoyanov 46abdd7
index 7fa58682b..c36e631cf 100644
Radostin Stoyanov 46abdd7
--- a/criu/namespaces.c
Radostin Stoyanov 46abdd7
+++ b/criu/namespaces.c
Radostin Stoyanov 46abdd7
@@ -1330,11 +1330,6 @@ static int usernsd(int sk)
Radostin Stoyanov 46abdd7
 		unsc_msg_pid_fd(&um, &pid, &fd;;
Radostin Stoyanov 46abdd7
 		pr_debug("uns: daemon calls %p (%d, %d, %x)\n", call, pid, fd, flags);
Radostin Stoyanov 46abdd7
 
Radostin Stoyanov 46abdd7
-		if (fd < 0 && flags & UNS_FDOUT) {
Radostin Stoyanov 46abdd7
-			pr_err("uns: bad flags/fd %p %d %x\n", call, fd, flags);
Radostin Stoyanov 46abdd7
-			BUG();
Radostin Stoyanov 46abdd7
-		}
Radostin Stoyanov 46abdd7
-
Radostin Stoyanov 46abdd7
 		/*
Radostin Stoyanov 46abdd7
 		 * Caller has sent us bare address of the routine it
Radostin Stoyanov 46abdd7
 		 * wants to call. Since the caller is fork()-ed from the
Radostin Stoyanov 46abdd7
-- 
Radostin Stoyanov 46abdd7
2.34.1
Radostin Stoyanov 46abdd7