From 69afd0438e3213b8bf6d74bdf9c288772f81e834 Mon Sep 17 00:00:00 2001
From: Jamie Liu <jamieliu@google.com>
Date: Fri, 29 Mar 2019 13:15:49 -0700
Subject: Return srclen in proc.idMapFileOperations.Write.
PiperOrigin-RevId: 241037926
Change-Id: I4b0381ac1c7575e8b861291b068d3da22bc03850
---
pkg/sentry/fs/proc/uid_gid_map.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'pkg/sentry/fs')
diff --git a/pkg/sentry/fs/proc/uid_gid_map.go b/pkg/sentry/fs/proc/uid_gid_map.go
index a52e0cb1f..0c68bbfc9 100644
--- a/pkg/sentry/fs/proc/uid_gid_map.go
+++ b/pkg/sentry/fs/proc/uid_gid_map.go
@@ -169,5 +169,8 @@ func (imfo *idMapFileOperations) Write(ctx context.Context, file *fs.File, src u
if err != nil {
return 0, err
}
- return int64(len(b)), nil
+
+ // On success, Linux's kernel/user_namespace.c:map_write() always returns
+ // count, even if fewer bytes were used.
+ return int64(srclen), nil
}
--
cgit v1.2.3