qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BZ #1254] 

* sysdeps/mach/hurd/getpeername.c (__getpeername): Respect *LEN
	byte limit when setting ADDR->sa_family.
	Reported by Samuel Thibault <samuel.thibault@ens-lyon.org>.
This commit is contained in:
Roland McGrath 2005-10-16 10:09:35 +00:00
parent cdb3f98a2e
commit 0faa1cf58b
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2005-10-16 Roland McGrath <roland@frob.com> 2005-10-16 Roland McGrath <roland@frob.com>
[BZ #1254]
* sysdeps/mach/hurd/getpeername.c (__getpeername): Respect *LEN
byte limit when setting ADDR->sa_family.
Reported by Samuel Thibault <samuel.thibault@ens-lyon.org>.
[BZ #1253] [BZ #1253]
* sysdeps/mach/hurd/dl-sysdep.h * sysdeps/mach/hurd/dl-sysdep.h
[SHARED] (DL_ARGV_NOT_RELRO): New macro. [SHARED] (DL_ARGV_NOT_RELRO): New macro.

4
nptl/ChangeLog
View File

@ -1,3 +1,7 @@
2005-10-10 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile ($(test-modules)): Remove static pattern rule.
2005-10-14 Jakub Jelinek <jakub@redhat.com> 2005-10-14 Jakub Jelinek <jakub@redhat.com>
Ulrich Drepper <drepper@redhat.com> Ulrich Drepper <drepper@redhat.com>

11
sysdeps/mach/hurd/getpeername.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992, 1994, 1997, 1999, 2000 Free Software Foundation, Inc. /* Copyright (C) 1992,1994,1997,1999,2000,2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -47,14 +47,19 @@ __getpeername (int fd, __SOCKADDR_ARG addrarg, socklen_t *len)
if (*len > buflen) if (*len > buflen)
*len = buflen; *len = buflen;
if (buf != (char *) addr) if (buf != (char *) addr)
{ {
memcpy (addr, buf, *len); memcpy (addr, buf, *len);
__vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen); __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen);
} }
addr->sa_family = type; const sa_family_t family = type;
if (*len < (char *) (&addr->sa_family + 1) - (char *) addr)
memcpy (&addr->sa_family, &family,
*len - offsetof (struct sockaddr, sa_family));
else
addr->sa_family = family;
return 0; return 0;
} }