Skip to contentSkip to conversation

unshare: some idmap fixes

PATCH Applied Sean Anderson 2 participants 5 messages Jan 15, 2022 – Jan 18, 2022 Util-Linux package

lore
Share & tools
lore
#0 lore raw

cover unshare: some idmap fixes

This series has some fixes to code and documentation around idmaps.

Sean Anderson (2):
unshare: Fix parsing of id maps
unshare: Fix doc comments

 sys-utils/unshare.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/2 unshare: Fix parsing of id maps

For whatever reason, mem2strcpy places the nul-terminator at the end of the buffer instead of at the end of the string it copies. This makes it completely useless for our purposes, since one would have to add a terminator manually to avoid getting garbage. Just use memcpy instead.

Fixes ff5dc96eb ("unshare: Add options to map blocks of user/group IDs")

---

 sys-utils/unshare.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
sys-utils/unshare.c +3 -2
index 443358952..889c561ca 100644
@@ -387,8 +387,9 @@ static int uint_to_id(const char *name, size_t sz)
 {
 	char buf[UID_BUFSIZ];
 
-	mem2strcpy(buf, name, sz, sizeof(buf));
-	return strtoul_or_err(name, _("could not parse ID"));
+	memcpy(buf, name, min(sz, sizeof(buf) - 1));
+	buf[sz] = '\0';
+	return strtoul_or_err(buf, _("could not parse ID"));
 }
 
 /**
Signature · 1 line
2.34.1
maintainer
#2 lore raw

Re: [PATCH 1/2] unshare: Fix parsing of id maps

Quoted 2 lines · Sean Anderson

For whatever reason, mem2strcpy places the nul-terminator at the end of the buffer

Yes, it was originally designed for utmp-like strings where rest of the buffer is filled by nul-terminators. I think we can fix it to make it usable for normal strings too.

Quoted 17 lines

instead of at the end of the string it copies. This makes it completely useless for our purposes, since one would have to add a terminator manually to avoid getting garbage. Just use memcpy instead.

Fixes ff5dc96eb ("unshare: Add options to map blocks of user/group IDs")

---

 sys-utils/unshare.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
sys-utils/unshare.c +0 -0
index 443358952..889c561ca 100644

sys-utils/unshare.c static int uint_to_id(const char *name, size_t sz) · line 391

Quoted 7 lines
sys-utils/unshare.c +2 -2
@@ -387,8 +387,9 @@ static int uint_to_id(const char *name, size_t sz)
 {
 	char buf[UID_BUFSIZ];
 
-	mem2strcpy(buf, name, sz, sizeof(buf));
-	return strtoul_or_err(name, _("could not parse ID"));
+	memcpy(buf, name, min(sz, sizeof(buf) - 1));
+	buf[sz] = '\0';
        ^^

What about sz > sizeof(buf)?

Maybe it would be enough to improve mem2strcpy() in include/strutils.h

- dest[nmax-1] = '\0';
+ dest[n] = '\0';

Karel

Signature · 2 lines
 Karel Zak  <[email protected]>
 http://karelzak.blogspot.com
#3 lore raw

PATCH 2/2 unshare: Fix doc comments

In reply to Sean Anderson

Several doc comments use the wrong terminology, or have mismatches descriptions. Fix them.

Fixes ff5dc96eb ("unshare: Add options to map blocks of user/group IDs")

---

 sys-utils/unshare.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
sys-utils/unshare.c +4 -4
index 889c561ca..edce65c77 100644
@@ -359,8 +359,8 @@ static gid_t get_group(const char *s, const char *err)
 
 /**
  * struct map_range - A range of IDs to map
- * @outer: First ID inside the namespace
- * @inner: First ID outside the namespace
+ * @outer: First ID mapped on the outside of the namespace
+ * @inner: First ID mapped on the inside of the namespace
  * @count: Length of the inside and outside ranges
  *
  * A range of uids/gids to map using new[gu]idmap.
@@ -394,9 +394,9 @@ static int uint_to_id(const char *name, size_t sz)
 
 /**
  * get_map_range() - Parse a mapping range from a string
- * @s: A string of the format upper,lower,count
+ * @s: A string of the format outer,inner,count
  *
- * Parse a string of the form upper,lower,count into a new mapping range.
+ * Parse a string of the form outer,inner,count into a new mapping range.
  *
  * Return: A new &struct map_range
  */
Signature · 1 line
2.34.1
maintainer Applied
#4 lore raw
In reply to Sean Anderson
Quoted 5 lines · Sean Anderson

This series has some fixes to code and documentation around idmaps.

Sean Anderson (2):
unshare: Fix parsing of id maps

I have fixed mem2strcpy().

Quoted 1 line

unshare: Fix doc comments

Applied. Thanks!

Karel

Signature · 2 lines
 Karel Zak  <[email protected]>
 http://karelzak.blogspot.com