picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* nis/nis_domain_of_r.c (nis_domain_of_r): Add missing buffer

Browse source 
overflow test.
This commit is contained in:
Ulrich Drepper 2006-05-24 04:07:18 +00:00
parent a17fa6100d
commit 2d571cd125
5 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-05-23 Ulrich Drepper <drepper@redhat.com>
* nis/nis_domain_of_r.c (nis_domain_of_r): Add missing buffer
overflow test.
2006-05-20 Ulrich Drepper <drepper@redhat.com> 2006-05-20 Ulrich Drepper <drepper@redhat.com>
* nis/nis_call.c (__prepare_niscall): New function. Split out * nis/nis_call.c (__prepare_niscall): New function. Split out

1
nis/libnsl.h
View file

@ -29,6 +29,7 @@ extern int _nsl_default_nss (void);
/* Set up everything for a call to __do_niscall3. */ /* Set up everything for a call to __do_niscall3. */
extern nis_error __prepare_niscall (const_nis_name name, directory_obj **dirp, extern nis_error __prepare_niscall (const_nis_name name, directory_obj **dirp,
dir_binding *bptrp, unsigned int flags); dir_binding *bptrp, unsigned int flags);
libnsl_hidden_proto (__prepare_niscall)
extern struct ib_request *__create_ib_request (const_nis_name name, extern struct ib_request *__create_ib_request (const_nis_name name,
unsigned int flags); unsigned int flags);

4
nis/nis_call.c
View file

@ -30,6 +30,7 @@
#include "nis_xdr.h" #include "nis_xdr.h"
#include "nis_intern.h" #include "nis_intern.h"
#include <libnsl.h>
static const struct timeval RPCTIMEOUT = {10, 0}; static const struct timeval RPCTIMEOUT = {10, 0};
static const struct timeval UDPTIMEOUT = {5, 0}; static const struct timeval UDPTIMEOUT = {5, 0};
@ -293,6 +294,8 @@ __do_niscall3 (dir_binding *dbp, u_long prog, xdrproc_t xargs, caddr_t req,
return retcode; return retcode;
} }
libnsl_hidden_def (__do_niscall3)
nis_error nis_error
__do_niscall2 (const nis_server *server, u_int server_len, u_long prog, __do_niscall2 (const nis_server *server, u_int server_len, u_long prog,
@ -573,6 +576,7 @@ __prepare_niscall (const_nis_name name, directory_obj **dirp,
return retcode; return retcode;
} }
libnsl_hidden_def (__prepare_niscall)
nis_error nis_error

9
nis/nis_domain_of_r.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 1997, 2004 Free Software Foundation, Inc. /* Copyright (c) 1997, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
@ -29,6 +29,7 @@ nis_domain_of_r (const_nis_name name, char *buffer, size_t buflen)
if (buffer == NULL) if (buffer == NULL)
{ {
erange:
__set_errno (ERANGE); __set_errno (ERANGE);
return NULL; return NULL;
} }
@ -44,7 +45,11 @@ nis_domain_of_r (const_nis_name name, char *buffer, size_t buflen)
cptr_len = strlen (cptr); cptr_len = strlen (cptr);
if (cptr_len == 0) if (cptr_len == 0)
return strcpy (buffer, "."); {
if (buflen < 2)
goto erange;
return strcpy (buffer, ".");
}
if (__builtin_expect (cptr_len >= buflen, 0)) if (__builtin_expect (cptr_len >= buflen, 0))
{ {

3
nis/nis_intern.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. /* Copyright (c) 1997,1998,1999,2000,2001,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
@ -66,6 +66,7 @@ extern nis_error __do_niscall3 (dir_binding *dbp, u_long prog,
xdrproc_t xargs, caddr_t req, xdrproc_t xargs, caddr_t req,
xdrproc_t xres, caddr_t resp, xdrproc_t xres, caddr_t resp,
unsigned int flags, nis_cb *cb); unsigned int flags, nis_cb *cb);
libnsl_hidden_proto (__do_niscall3)
extern u_short __pmap_getnisport (struct sockaddr_in *address, u_long program, extern u_short __pmap_getnisport (struct sockaddr_in *address, u_long program,
u_long version, u_int protocol); u_long version, u_int protocol);