diff options
author | trasz <trasz@FreeBSD.org> | 2010-04-13 06:01:24 +0000 |
---|---|---|
committer | trasz <trasz@FreeBSD.org> | 2010-04-13 06:01:24 +0000 |
commit | c79cf0b1c9291cf43f8fbdbe73cd46a4c0579063 (patch) | |
tree | 90c00205856b65c95008466cdeb7761025893a8e /lib | |
parent | 3e075f5b2e0ed6f3c0e3fbe52226c1fa3df85b91 (diff) | |
download | FreeBSD-src-c79cf0b1c9291cf43f8fbdbe73cd46a4c0579063.zip FreeBSD-src-c79cf0b1c9291cf43f8fbdbe73cd46a4c0579063.tar.gz |
MFC r205796:
Make acl_to_text_np(3) not crash on long group or user names in NFSv4 ACLs.
PR: amd64/145091
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc/posix1e/acl_to_text_nfs4.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/libc/posix1e/acl_to_text_nfs4.c b/lib/libc/posix1e/acl_to_text_nfs4.c index 3adbfb4..5d0aa31 100644 --- a/lib/libc/posix1e/acl_to_text_nfs4.c +++ b/lib/libc/posix1e/acl_to_text_nfs4.c @@ -167,7 +167,7 @@ format_additional_id(char *str, size_t size, const acl_entry_t entry) static int format_entry(char *str, size_t size, const acl_entry_t entry, int flags) { - size_t off = 0, padding_length, maximum_who_field_length = 18; + size_t off = 0, min_who_field_length = 18; acl_permset_t permset; acl_flagset_t flagset; int error, len; @@ -188,12 +188,9 @@ format_entry(char *str, size_t size, const acl_entry_t entry, int flags) if (error) return (error); len = strlen(buf); - padding_length = maximum_who_field_length - len; - if (padding_length > 0) { - memset(str, ' ', padding_length); - off += padding_length; - } - off += snprintf(str + off, size - off, "%s:", buf); + if (len < min_who_field_length) + len = min_who_field_length; + off += snprintf(str + off, size - off, "%*s:", len, buf); error = _nfs4_format_access_mask(buf, sizeof(buf), *permset, flags & ACL_TEXT_VERBOSE); |