diff options
| author | Roland McGrath <roland@gnu.org> | 2005-10-23 00:53:24 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-10-23 00:53:24 +0000 |
| commit | 9c4e4fbc86b7952c045579041b36478997c49fa1 (patch) | |
| tree | 73e13dbd475f87090cce0db3437c5526ef1a21fe | |
| parent | 4d2b05d75eb6a9069bde2f112b6f566ec2c49081 (diff) | |
| download | glibc-9c4e4fbc86b7952c045579041b36478997c49fa1.tar.gz glibc-9c4e4fbc86b7952c045579041b36478997c49fa1.tar.xz glibc-9c4e4fbc86b7952c045579041b36478997c49fa1.zip | |
2005-10-22 Roland McGrath <roland@frob.com>
[BZ #1254] * sysdeps/mach/hurd/getpeername.c (__getpeername): Fix last change. From Samuel Thibault <samuel.thibault@ens-lyon.org>. 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>.
| -rw-r--r-- | sysdeps/mach/hurd/getpeername.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sysdeps/mach/hurd/getpeername.c b/sysdeps/mach/hurd/getpeername.c index 2e4f9f6a9d..325b6fd75d 100644 --- a/sysdeps/mach/hurd/getpeername.c +++ b/sysdeps/mach/hurd/getpeername.c @@ -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. The GNU C Library is free software; you can redistribute it and/or @@ -47,14 +47,22 @@ __getpeername (int fd, __SOCKADDR_ARG addrarg, socklen_t *len) if (*len > buflen) *len = buflen; - + if (buf != (char *) addr) { memcpy (addr, buf, *len); __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen); } - addr->sa_family = type; + const sa_family_t family = type; + if (*len > offsetof (struct sockaddr, sa_family)) + { + 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; } |