From 0faa1cf58bad1371ba182e557ce46dfacc6a6002 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 16 Oct 2005 10:09:35 +0000 Subject: [PATCH] [BZ #1254] * sysdeps/mach/hurd/getpeername.c (__getpeername): Respect *LEN byte limit when setting ADDR->sa_family. Reported by Samuel Thibault . --- ChangeLog | 5 +++++ nptl/ChangeLog | 4 ++++ sysdeps/mach/hurd/getpeername.c | 11 ++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf3d821..b368062 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-10-16 Roland McGrath + [BZ #1254] + * sysdeps/mach/hurd/getpeername.c (__getpeername): Respect *LEN + byte limit when setting ADDR->sa_family. + Reported by Samuel Thibault . + [BZ #1253] * sysdeps/mach/hurd/dl-sysdep.h [SHARED] (DL_ARGV_NOT_RELRO): New macro. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 7059de6..3c8e73a 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2005-10-10 Daniel Jacobowitz + + * Makefile ($(test-modules)): Remove static pattern rule. + 2005-10-14 Jakub Jelinek Ulrich Drepper diff --git a/sysdeps/mach/hurd/getpeername.c b/sysdeps/mach/hurd/getpeername.c index 2e4f9f6..39071c1 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; } -- 2.7.4