diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-08-10 08:06:10 -0700 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-08-11 19:40:35 +0000 |
| commit | da76de230417eb9811d04013d8fd13fdbfdaa677 (patch) | |
| tree | 237e634805aaa50a4c32b0c615f0d31dbe96853d | |
| parent | 2bc547cc174ec64d9d87c2aea591f3d3930651b1 (diff) | |
VPP-319: Fix handling of ERANGE from getgrnam_r
Change-Id: I1c5b3ed678622a0352fb881f2236a514743f3c50
Signed-off-by: Ed Warnicke <eaw@cisco.com>
| -rw-r--r-- | vpp/vpp-api/api.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c index db9cd203..41b39752 100644 --- a/vpp/vpp-api/api.c +++ b/vpp/vpp-api/api.c @@ -8139,11 +8139,12 @@ api_segment_config (vlib_main_t * vm, unformat_input_t * input) { u8 *chroot_path; int uid, gid, rv; - char *s, buf[128]; + const int max_buf_size = 4096; + char *s, *buf; struct passwd _pw, *pw; struct group _grp, *grp; clib_error_t *e; - + buf = vec_new(char,128); while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "prefix %s", &chroot_path)) @@ -8159,7 +8160,10 @@ api_segment_config (vlib_main_t * vm, unformat_input_t * input) { /* lookup the username */ pw = NULL; - rv = getpwnam_r (s, &_pw, buf, sizeof (buf), &pw); + while (((rv = getpwnam_r (s, &_pw, buf, sizeof (buf), &pw)) == ERANGE) && ( vec_len(buf) <= max_buf_size )) + { + vec_resize(buf,vec_len(buf)*2); + } if (rv < 0) { e = clib_error_return_code (0, rv, @@ -8167,6 +8171,7 @@ api_segment_config (vlib_main_t * vm, unformat_input_t * input) CLIB_ERROR_FATAL, "cannot fetch username %s", s); vec_free (s); + vec_free (buf); return e; } if (pw == NULL) @@ -8174,6 +8179,7 @@ api_segment_config (vlib_main_t * vm, unformat_input_t * input) e = clib_error_return_fatal (0, "username %s does not exist", s); vec_free (s); + vec_free (buf); return e; } vec_free (s); @@ -8183,7 +8189,10 @@ api_segment_config (vlib_main_t * vm, unformat_input_t * input) { /* lookup the group name */ grp = NULL; - rv = getgrnam_r (s, &_grp, buf, sizeof (buf), &grp); + while ( ( (rv = getgrnam_r (s, &_grp, buf, vec_len(buf), &grp)) == ERANGE ) && ( vec_len(buf) <= max_buf_size ) ) + { + vec_resize(buf,vec_len(buf)*2); + } if (rv != 0) { e = clib_error_return_code (0, rv, @@ -8191,15 +8200,18 @@ api_segment_config (vlib_main_t * vm, unformat_input_t * input) CLIB_ERROR_FATAL, "cannot fetch group %s", s); vec_free (s); + vec_free (buf); return e; } if (grp == NULL) { e = clib_error_return_fatal (0, "group %s does not exist", s); vec_free (s); + vec_free (buf); return e; } vec_free (s); + vec_free (buf); vl_set_memory_gid (grp->gr_gid); } else |