diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a64306723..0c28fe31b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-16  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* fhandler.cc (fhandler_base::read_overlapped): Preserve len when
+	looping due to received signal.
+
 2009-06-15  Corinna Vinschen  <corinna@vinschen.de>
 
 	* net.cc (get_flags): New static function to generate interface flags
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 2e909fbd1..16ec8114d 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -1772,21 +1772,22 @@ fhandler_base::wait_overlapped (bool inres, bool writing, DWORD *bytes, DWORD le
 void
 fhandler_base::read_overlapped (void *ptr, size_t& len)
 {
+  DWORD bytes_written;
   while (1)
     {
-      bool res = ReadFile (get_handle (), ptr, len, (DWORD *) &len,
+      bool res = ReadFile (get_handle (), ptr, len, &bytes_written,
 			   get_overlapped ());
-      int wres = wait_overlapped (res, false, (DWORD *) &len);
+      int wres = wait_overlapped (res, false, &bytes_written);
       if (wres || !_my_tls.call_signal_handler ())
 	break;
     }
+  len = (size_t) bytes_written;
 }
 
 int
 fhandler_base::write_overlapped (const void *ptr, size_t len)
 {
   DWORD bytes_written;
-
   while (1)
     {
       bool res = WriteFile (get_output_handle (), ptr, len, &bytes_written,