Skip to contentSkip to conversation

idmapped-mounts: account for EOVERFLOW

PATCH In review Christian Brauner 2 participants 2 messages Sep 20, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 idmapped-mounts: account for EOVERFLOW

We introduced a new type vfs{g,u}id_t into the vfs in b27c82e12965 ("attr: port attribute changes to new types"). This type makes sure that {g,u}ids mapped into an idmapped mount are distinct from regular k{g,u}id_t. This expands the possible errnos that users may see so we need to handle both EINVAL and EOVERFLOW.

Cc Seth Forshee (DigitalOcean) <[email protected]>
Cc Christoph Hellwig <[email protected]>
---
 src/vfs/idmapped-mounts.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
src/vfs/idmapped-mounts.c +2 -2
index c010dfa1..ed7948b6 100644
@@ -7367,7 +7367,7 @@ static int setattr_fix_968219708108(const struct vfstest_info *info)
 		 */
 		if (!fchownat(open_tree_fd, FILE1, 0, 0, AT_SYMLINK_NOFOLLOW))
 			die("failure: change ownership");
-		if (errno != EINVAL)
+		if (errno != EINVAL && errno != EOVERFLOW)
 			die("failure: errno");
 
 		/*
@@ -7457,7 +7457,7 @@ static int setattr_fix_968219708108(const struct vfstest_info *info)
 		 */
 		if (!fchownat(open_tree_fd, FILE1, 0, 0, AT_SYMLINK_NOFOLLOW))
 			die("failure: change ownership");
-		if (errno != EINVAL)
+		if (errno != EINVAL && errno != EOVERFLOW)
 			die("failure: errno");
 
 		/*

base-commit: 890c50823b6430bf0929d9a57e76b9b4d6bbc25f

Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Christian Brauner

We introduced a new type vfs{g,u}id_t into the vfs in b27c82e12965 ("attr: port attribute changes to new types"). This type makes sure that {g,u}ids mapped into an idmapped mount are distinct from regular k{g,u}id_t. This expands the possible errnos that users may see so we need to handle both EINVAL and EOVERFLOW.

Cc Seth Forshee (DigitalOcean) <[email protected]>
Cc Christoph Hellwig <[email protected]>

---

Make sense to me,

Quoted 30 lines
 src/vfs/idmapped-mounts.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
src/vfs/idmapped-mounts.c +2 -2
index c010dfa1..ed7948b6 100644
@@ -7367,7 +7367,7 @@ static int setattr_fix_968219708108(const struct vfstest_info *info)
 		 */
 		if (!fchownat(open_tree_fd, FILE1, 0, 0, AT_SYMLINK_NOFOLLOW))
 			die("failure: change ownership");
-		if (errno != EINVAL)
+		if (errno != EINVAL && errno != EOVERFLOW)
 			die("failure: errno");
 
 		/*
@@ -7457,7 +7457,7 @@ static int setattr_fix_968219708108(const struct vfstest_info *info)
 		 */
 		if (!fchownat(open_tree_fd, FILE1, 0, 0, AT_SYMLINK_NOFOLLOW))
 			die("failure: change ownership");
-		if (errno != EINVAL)
+		if (errno != EINVAL && errno != EOVERFLOW)
 			die("failure: errno");
 
 		/*

base-commit: 890c50823b6430bf0929d9a57e76b9b4d6bbc25f

Signature · 1 line
2.34.1