-/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
#include <nss.h>
#include <netdb.h>
#include <ctype.h>
#include <errno.h>
#include <string.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
__libc_lock_define_initialized (static, lock)
-struct response_t
-{
- char *val;
- struct response_t *next;
-};
-
-struct intern_t
-{
- struct response_t *start;
- struct response_t *next;
-};
-typedef struct intern_t intern_t;
+static intern_t intern;
-static intern_t intern = {NULL, NULL};
-static int
-saveit (int instatus, char *inkey, int inkeylen, char *inval,
- int invallen, char *indata)
+static void
+internal_nis_endrpcent (intern_t *intern)
{
- intern_t *intern = (intern_t *)indata;
+ struct response_t *curr = intern->next;
- if (instatus != YP_TRUE)
- return instatus;
-
- if (inkey && inkeylen > 0 && inval && invallen > 0)
+ while (curr != NULL)
{
- if (intern->start == NULL)
- {
- intern->start = malloc (sizeof (struct response_t));
- if (intern->start == NULL)
- return YP_FALSE;
- intern->next = intern->start;
- }
- else
- {
- intern->next->next = malloc (sizeof (struct response_t));
- if (intern->next->next == NULL)
- return YP_FALSE;
- intern->next = intern->next->next;
- }
- intern->next->next = NULL;
- intern->next->val = malloc (invallen + 1);
- if (intern->next->val == NULL)
- return YP_FALSE;
- strncpy (intern->next->val, inval, invallen);
- intern->next->val[invallen] = '\0';
+ struct response_t *last = curr;
+ curr = curr->next;
+ free (last);
}
- return 0;
+ intern->next = intern->start = NULL;
}
static enum nss_status
if (yp_get_default_domain (&domainname))
return NSS_STATUS_UNAVAIL;
- while (intern->start != NULL)
- {
- if (intern->start->val != NULL)
- free (intern->start->val);
- intern->next = intern->start;
- intern->start = intern->start->next;
- free (intern->next);
- }
- intern->start = NULL;
+ internal_nis_endrpcent (intern);
+
+ ypcb.foreach = _nis_saveit;
+ ypcb.data = (char *) intern;
+ status = yperr2nss (yp_all (domainname, "rpc.bynumber", &ypcb));
+
+ /* Mark the last buffer as full. */
+ if (intern->next != NULL)
+ intern->next->size = intern->offset;
- ypcb.foreach = saveit;
- ypcb.data = (char *)intern;
- status = yperr2nss (yp_all(domainname, "rpc.bynumber", &ypcb));
intern->next = intern->start;
+ intern->offset = 0;
return status;
}
return status;
}
-static enum nss_status
-internal_nis_endrpcent (intern_t *intern)
-{
- while (intern->start != NULL)
- {
- if (intern->start->val != NULL)
- free (intern->start->val);
- intern->next = intern->start;
- intern->start = intern->start->next;
- free (intern->next);
- }
- intern->start = NULL;
-
- return NSS_STATUS_SUCCESS;
-}
-
enum nss_status
_nss_nis_endrpcent (void)
{
- enum nss_status status;
-
__libc_lock_lock (lock);
- status = internal_nis_endrpcent (&intern);
+ internal_nis_endrpcent (&intern);
__libc_lock_unlock (lock);
- return status;
+ return NSS_STATUS_SUCCESS;
}
static enum nss_status
internal_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen,
- int *errnop, intern_t *data)
+ int *errnop, intern_t *intern)
{
struct parser_data *pdata = (void *) buffer;
int parse_res;
char *p;
- if (data->start == NULL)
- internal_nis_setrpcent (data);
+ if (intern->start == NULL)
+ internal_nis_setrpcent (intern);
+
+ if (intern->next == NULL)
+ /* Not one entry in the map. */
+ return NSS_STATUS_NOTFOUND;
/* Get the next entry until we found a correct one. */
do
{
- if (data->next == NULL)
+ struct response_t *bucket = intern->next;
+
+ if (__glibc_unlikely (intern->offset >= bucket->size))
{
- *errnop = ENOENT;
- return NSS_STATUS_NOTFOUND;
+ if (bucket->next == NULL)
+ return NSS_STATUS_NOTFOUND;
+
+ /* We look at all the content in the current bucket. Go on
+ to the next. */
+ bucket = intern->next = bucket->next;
+ intern->offset = 0;
+ }
+
+ for (p = &bucket->mem[intern->offset]; isspace (*p); ++p)
+ ++intern->offset;
+
+ size_t len = strlen (p) + 1;
+ if (__glibc_unlikely (len > buflen))
+ {
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
}
- p = strncpy (buffer, data->next->val, buflen);
- while (isspace (*p))
- ++p;
+
+ /* We unfortunately have to copy the data in the user-provided
+ buffer because that buffer might be around for a very long
+ time and the servent structure must remain valid. If we would
+ rely on the BUCKET memory the next 'setservent' or 'endservent'
+ call would destroy it.
+
+ The important thing is that it is a single NUL-terminated
+ string. This is what the parsing routine expects. */
+ p = memcpy (buffer, &bucket->mem[intern->offset], len);
parse_res = _nss_files_parse_rpcent (p, rpc, pdata, buflen, errnop);
- if (parse_res == -1)
+ if (__glibc_unlikely (parse_res == -1))
return NSS_STATUS_TRYAGAIN;
- data->next = data->next->next;
+
+ intern->offset += len;
}
while (!parse_res);
_nss_nis_getrpcbyname_r (const char *name, struct rpcent *rpc,
char *buffer, size_t buflen, int *errnop)
{
- intern_t data = {NULL, NULL};
- enum nss_status status;
- int found;
-
if (name == NULL)
{
*errnop = EINVAL;
return NSS_STATUS_UNAVAIL;
}
- status = internal_nis_setrpcent (&data);
- if (status != NSS_STATUS_SUCCESS)
+ intern_t data = { NULL, NULL, 0 };
+ enum nss_status status = internal_nis_setrpcent (&data);
+ if (__glibc_unlikely (status != NSS_STATUS_SUCCESS))
return status;
- found = 0;
- while (!found &&
- ((status = internal_nis_getrpcent_r (rpc, buffer, buflen, errnop,
- &data)) == NSS_STATUS_SUCCESS))
+ int found = 0;
+ while (!found
+ && ((status = internal_nis_getrpcent_r (rpc, buffer, buflen, errnop,
+ &data)) == NSS_STATUS_SUCCESS))
{
if (strcmp (rpc->r_name, name) == 0)
found = 1;
internal_nis_endrpcent (&data);
- if (!found && status == NSS_STATUS_SUCCESS)
- {
- *errnop = ENOENT;
- return NSS_STATUS_NOTFOUND;
- }
- else
- return status;
+ if (__glibc_unlikely (!found && status == NSS_STATUS_SUCCESS))
+ return NSS_STATUS_NOTFOUND;
+
+ return status;
}
enum nss_status
_nss_nis_getrpcbynumber_r (int number, struct rpcent *rpc,
char *buffer, size_t buflen, int *errnop)
{
- struct parser_data *data = (void *) buffer;
- enum nss_status retval;
- char *domain, *result, *p;
- int len, nlen, parse_res;
- char buf[32];
-
- if (yp_get_default_domain (&domain))
+ char *domain;
+ if (__glibc_unlikely (yp_get_default_domain (&domain)))
return NSS_STATUS_UNAVAIL;
- nlen = sprintf (buf, "%d", number);
+ char buf[32];
+ int nlen = snprintf (buf, sizeof (buf), "%d", number);
- retval = yperr2nss (yp_match (domain, "rpc.bynumber", buf,
- nlen, &result, &len));
+ char *result;
+ int len;
+ int yperr = yp_match (domain, "rpc.bynumber", buf, nlen, &result, &len);
- if (retval != NSS_STATUS_SUCCESS)
+ if (__glibc_unlikely (yperr != YPERR_SUCCESS))
{
- if (retval == NSS_STATUS_NOTFOUND)
- *errnop = ENOENT;
- else if (retval == NSS_STATUS_TRYAGAIN)
+ enum nss_status retval = yperr2nss (yperr);
+
+ if (retval == NSS_STATUS_TRYAGAIN)
*errnop = errno;
return retval;
}
- if ((size_t) (len + 1) > buflen)
+ if (__glibc_unlikely ((size_t) (len + 1) > buflen))
{
free (result);
*errnop = ERANGE;
return NSS_STATUS_TRYAGAIN;
}
- p = strncpy (buffer, result, len);
+ char *p = strncpy (buffer, result, len);
buffer[len] = '\0';
while (isspace (*p))
++p;
free (result);
- parse_res = _nss_files_parse_rpcent (p, rpc, data, buflen, errnop);
-
- if (parse_res < 1)
+ int parse_res = _nss_files_parse_rpcent (p, rpc, (void *) buffer, buflen,
+ errnop);
+ if (__glibc_unlikely (parse_res < 1))
{
if (parse_res == -1)
return NSS_STATUS_TRYAGAIN;
else
- {
- *errnop = ENOENT;
- return NSS_STATUS_NOTFOUND;
- }
+ return NSS_STATUS_NOTFOUND;
}
else
return NSS_STATUS_SUCCESS;
projects / thirdparty / glibc.git / blobdiff