about summary refs log tree commit diff
path: root/sysdeps/mach/hurd/getpeername.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-10-16 10:09:35 +0000
committerRoland McGrath <roland@gnu.org>2005-10-16 10:09:35 +0000
commit0faa1cf58bad1371ba182e557ce46dfacc6a6002 (patch)
treea746690c7f57d4fd30c0db684e2c8027c73b0228 /sysdeps/mach/hurd/getpeername.c
parentcdb3f98a2e9384eeec59ae639a6b361bac250902 (diff)
downloadglibc-0faa1cf58bad1371ba182e557ce46dfacc6a6002.tar.gz
glibc-0faa1cf58bad1371ba182e557ce46dfacc6a6002.tar.xz
glibc-0faa1cf58bad1371ba182e557ce46dfacc6a6002.zip
[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>.
Diffstat (limited to 'sysdeps/mach/hurd/getpeername.c')
-rw-r--r--sysdeps/mach/hurd/getpeername.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/sysdeps/mach/hurd/getpeername.c b/sysdeps/mach/hurd/getpeername.c
index 2e4f9f6a9d..39071c1da4 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,19 @@ __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 < (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;
 }