diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-01-30 11:44:34 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-01-30 11:44:34 +0000 |
commit | 6591c3356242ba48627beb29345e4e44242c7068 (patch) | |
tree | 402220c75072909733e8d383ea5b999f30f1f527 /nis | |
parent | 7f0ff1b04ad67b1a4f624a8ad54e7533d1c8aab3 (diff) | |
download | glibc-6591c3356242ba48627beb29345e4e44242c7068.tar.gz glibc-6591c3356242ba48627beb29345e4e44242c7068.tar.xz glibc-6591c3356242ba48627beb29345e4e44242c7068.zip |
Update.
1998-01-30 19:58 Ulrich Drepper <drepper@cygnus.com> * include/cpio.h: Move to ... * posix/cpio.h: ...here. * locale/programs/ld-collate.c: Fix typo. * signal/signal.h: Declare _sys_siglist with NSIG+1 elements. * stdio-common/tiformat.c: Add checks for %#.0o and friends. * login/utmp_file.c (pututline_file): Don't always report success if similar entry is found. Patch by Mark M. Kettenis. 1998-01-30 16:06 Philip Blundell <pb@nexus.co.uk> * manual/Makefile: Don't try to install the info files if makeinfo is not available. 1998-01-30 12:05 Philip Blundell <pb@nexus.co.uk> * sysdeps/unix/sysv/linux/bits/ioctls.h: Include a copy of the kernel's network ioctls, rather than using <linux/sockios.h> to get them. This way we are sure of maintaining compatibility if the kernel interface should change. 1998-01-30 15:52 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/Dist: Add netrose/rose.h. 1998-01-25 19:54 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/netrose/rose.h: New file. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Install it. 1998-01-27 22:29 Zack Weinberg <zack@rabi.phys.columbia.edu> Implement System V pseudoterminal handling. * login/Makefile (routines): Add getpt, grantpt, unlockpt, ptsname. (libutil-routines): Remove pty. Add openpty, forkpty. (distribute): New internal header pty-internal.h. (others): Add the helper program, pt_chown. (install-others): Install it, in $(libexecdir), mode 4755. * login/pty-internal.h: New file. * login/openpty.c: New file. * login/forkpty.c: New file. * login/programs/pt_chown.c: New file. * libc.map: Add getpt, grantpt, unlockpt, ptsname, ptsname_r. * stdlib/stdlib.h: Prototype them. * config.make.in: Define $(libexecdir). * Makeconfig: Define $(inst_libexecdir). * sysdeps/generic/pty.c: Removed. * sysdeps/unix/sysv/linux/pty.c: Removed. * sysdeps/generic/getpt.c: Stub out. * sysdeps/generic/grantpt.c: Likewise. * sysdeps/generic/ptsname.c: Likewise. * sysdeps/generic/unlockpt.c: Likewise. * sysdeps/unix/grantpt.c: New file. * sysdeps/unix/bsd/getpt.c: New file. * sysdeps/unix/bsd/unlockpt.c: New file. * sysdeps/unix/sysv/linux/getpt.c: New file. * sysdeps/unix/sysv/linux/ptsname.c: New file. * sysdeps/unix/sysv/linux/unlockpt.c: New file. 1998-01-29 23:56 Ulrich Drepper <drepper@cygnus.com> * localedata/locales/ru_RU: Fix YESEXPR. Patch by lav@yars.free.net. 1998-01-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/Makefile (tests): Add rule for test-netdb.c. * nss/test-netdb.c: New file. 1998-01-29 02:38 Ulrich Drepper <drepper@cygnus.com> * elf/dl-open.c (_dl_open): Make sure the variable `reloc' is really kept as a variable. Patch by Richard Henderson, reported by Jakub Jelinek <jj@sunsite.ms.mff.cuni.cz>. * elf/rtld.c (dl_main): Call _dl_init_paths before handling preloading. * elf/genrtldtbl.awk: Mark machine dependent directory of generated entries as not existing. 1998-01-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdio-common/vfprintf.c (process_arg): Fix printing of octal zero in alternate form with precision of zero, which must produce "0". Add braces to avoid ambiguous `else'. 1998-01-26 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_compat/compat-grp.c: Fix memory leak and trailing null problem with strncpy. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/comapt-spwd.c: Likewise. 1998-01-28 Andreas Jaeger <aj@arthur.rhein-neckar.de> * assert/assert.h (assert_perror): Correct test for errnum. Patch by uch@nop.or.jp. [PR libc/437] 1997-12-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * locales/pl_PL: Fix int_curr_symbol. 1998-01-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nis/nis_cache.c: Include <unistd.h> for declaration of close. 1998-01-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * stdio-common/test-popen.c: Include <errno.h>. * sysdeps/unix/sysv/linux/if_index.c: Include <unistd.h> for close. * inet/getnetgrent_r.c: Include <errno.h>. * db2/db/db_conv.c: Include <string.h> for memcpy. * gmon/bb_exit_func.c: Include <string.h> instead of <strings.h> so that memcpy is declared. * iconv/iconv_open.c: Include <stdlib.h> for alloca. * misc/init-misc.c: Remove unneeded inclusion of <errno.h>. 1998-01-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * pwd/fgetpwent_r.c (__fgetpwent_r): Correctly handle buffer overflow while reading line with fgets. * grp/fgetgrent_r.c (__fgetgrent_r): Likewise. 1998-01-27 00:46 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/bits/types.h (__ipc_pid_t): Change to unsigned short, not short. Reported by Andreas Jaeger. 1998-01-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/mips/syscalls.list: Correct typo (ccept->accept). * sysdeps/generic/inttypes.h: Fix spelling. 1998-01-04 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/arm/Dist: Add bits/mman.h. * sysdeps/unix/sysv/linux/alpha/Dist: Add net/route.h. 1998-01-27 00:30 Ulrich Drepper <drepper@cygnus.com> * stdio-common/printf.h (struct print_info): Add new bitfield is_char. * stdio-common/printf-parse.h (parse_one_spec): Fill in is_char field for hh modifier. * stdio-common/vfprint.c: Use is_char field and do not depend in is_short having the value 2. Bug reported by Andreas Jaeger. 1998-01-05 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libio/freopen.c (freopen): Call _IO_old_freopen only if defined PIC && DO_VERSIONING. 1998-01-24 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Rules: Add rules for $(common-objpfx)dummy$o.
Diffstat (limited to 'nis')
-rw-r--r-- | nis/nis_cache.c | 2 | ||||
-rw-r--r-- | nis/nss_compat/compat-grp.c | 45 | ||||
-rw-r--r-- | nis/nss_compat/compat-pwd.c | 48 | ||||
-rw-r--r-- | nis/nss_compat/compat-spwd.c | 33 |
4 files changed, 113 insertions, 15 deletions
diff --git a/nis/nis_cache.c b/nis/nis_cache.c index a0e1130077..26cac675a5 100644 --- a/nis/nis_cache.c +++ b/nis/nis_cache.c @@ -17,6 +17,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <string.h> +#include <unistd.h> #include <rpcsvc/nis.h> #include "nis_intern.h" diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c index dab1b5e566..ca5abc4d2c 100644 --- a/nis/nss_compat/compat-grp.c +++ b/nis/nss_compat/compat-grp.c @@ -263,6 +263,14 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, ent->nis = 0; return NSS_STATUS_UNAVAIL; } + + if ( buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + save_oldkey = ent->oldkey; save_oldlen = ent->oldkeylen; save_nis_first = TRUE; @@ -280,6 +288,13 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, return NSS_STATUS_NOTFOUND; } + if ( buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + save_oldkey = ent->oldkey; save_oldlen = ent->oldkeylen; save_nis_first = FALSE; @@ -287,7 +302,7 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, ent->oldkeylen = outkeylen; } - /* Copy the found data to our buffer */ + /* Copy the found data to our buffer... */ p = strncpy (buffer, outval, buflen); /* ...and free the data. */ @@ -427,8 +442,17 @@ getgrnam_plusgroup (const char *name, struct group *result, char *buffer, &outval, &outvallen) != YPERR_SUCCESS) return NSS_STATUS_NOTFOUND; - p = strncpy (buffer, outval, - buflen < (size_t) outvallen ? buflen : (size_t) outvallen); + if (buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + + /* Copy the found data to our buffer... */ + p = strncpy (buffer, outval, buflen); + + /* ... and free the data. */ free (outval); while (isspace (*p)) ++p; @@ -758,9 +782,20 @@ getgrgid_plusgroup (gid_t gid, struct group *result, char *buffer, *errnop = errno; return NSS_STATUS_TRYAGAIN; } - p = strncpy (buffer, outval, - buflen < (size_t) outvallen ? buflen : (size_t) outvallen); + + if (buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + + /* Copy the found data to our buffer... */ + p = strncpy (buffer, outval, buflen); + + /* ... and free the data. */ free (outval); + while (isspace (*p)) p++; parse_res = _nss_files_parse_grent (p, result, data, buflen, errnop); diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c index 5bfff17ca5..eec2634f3a 100644 --- a/nis/nss_compat/compat-pwd.c +++ b/nis/nss_compat/compat-pwd.c @@ -393,7 +393,7 @@ getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent, if (domain != NULL && strcmp (ypdomain, domain) != 0) continue; - /* If name != NULL, we are called from getpwnam */ + /* If name != NULL, we are called from getpwnam. */ if (name != NULL) if (strcmp (user, name) != 0) continue; @@ -406,12 +406,21 @@ getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent, p2len = pwd_need_buflen (&ent->pwd); if (p2len > buflen) { + free (outval); *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p2 = buffer + (buflen - p2len); buflen -= p2len; + + if (buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } p = strncpy (buffer, outval, buflen); + while (isspace (*p)) p++; free (outval); @@ -650,6 +659,13 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer, return NSS_STATUS_UNAVAIL; } + if (buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + saved_first = TRUE; saved_oldkey = ent->oldkey; saved_oldlen = ent->oldkeylen; @@ -668,6 +684,13 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer, return NSS_STATUS_NOTFOUND; } + if (buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + saved_first = FALSE; saved_oldkey = ent->oldkey; saved_oldlen = ent->oldkeylen; @@ -769,9 +792,13 @@ getpwnam_plususer (const char *name, struct passwd *result, char *buffer, &outval, &outvallen) != YPERR_SUCCESS) return NSS_STATUS_NOTFOUND; - ptr = strncpy (buffer, outval, buflen < (size_t) outvallen ? - buflen : (size_t) outvallen); - buffer[buflen < (size_t) outvallen ? buflen : (size_t) outvallen] = '\0'; + if (buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + ptr = strncpy (buffer, outval, buflen); free (outval); while (isspace (*ptr)) ptr++; @@ -1259,10 +1286,17 @@ getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer, *errnop = errno; return NSS_STATUS_TRYAGAIN; } - ptr = strncpy (buffer, outval, buflen < (size_t) outvallen ? - buflen : (size_t) outvallen); - buffer[buflen < (size_t) outvallen ? buflen : (size_t) outvallen] = '\0'; + + if ( buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + + ptr = strncpy (buffer, outval, buflen); free (outval); + while (isspace (*ptr)) ptr++; parse_res = _nss_files_parse_pwent (ptr, result, data, buflen, errnop); diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c index 816e9c1f0a..1d4216393a 100644 --- a/nis/nss_compat/compat-spwd.c +++ b/nis/nss_compat/compat-spwd.c @@ -359,11 +359,18 @@ getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent, p2len = spwd_need_buflen (&ent->pwd); if (p2len > buflen) { + free (outval); *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p2 = buffer + (buflen - p2len); buflen -= p2len; + if (buflen < ((size_t) outval + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } p = strncpy (buffer, outval, buflen); while (isspace (*p)) p++; @@ -601,6 +608,14 @@ getspent_next_nis (struct spwd *result, ent_t *ent, give_spwd_free (&ent->pwd); return NSS_STATUS_UNAVAIL; } + + if (buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + saved_first = TRUE; saved_oldkey = ent->oldkey; saved_oldlen = ent->oldkeylen; @@ -619,6 +634,13 @@ getspent_next_nis (struct spwd *result, ent_t *ent, return NSS_STATUS_NOTFOUND; } + if (buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + saved_first = FALSE; saved_oldkey = ent->oldkey; saved_oldlen = ent->oldkeylen; @@ -720,9 +742,14 @@ getspnam_plususer (const char *name, struct spwd *result, char *buffer, &outval, &outvallen) != YPERR_SUCCESS) return NSS_STATUS_NOTFOUND; - ptr = strncpy (buffer, outval, buflen < (size_t) outvallen ? - buflen : (size_t) outvallen); - buffer[buflen < (size_t) outvallen ? buflen : (size_t) outvallen] = '\0'; + if (buflen < ((size_t) outvallen + 1)) + { + free (outval); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + + ptr = strncpy (buffer, outval, buflen); free (outval); while (isspace (*ptr)) ptr++; |