* fhandler_procsys.cc (fhandler_procsys::read): Just call

	fhandler_base::raw_read from here.  Drop comment.
	(fhandler_procsys::write): Drop comment.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1fd037412b0847895b9ad2ccd4b69dabc49c6732..aae0ea9e070a5c8ca200ea242d54e0b4b25fd680 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-28  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_procsys.cc (fhandler_procsys::read): Just call
+       fhandler_base::raw_read from here.  Drop comment.
+       (fhandler_procsys::write): Drop comment.
+
 2013-05-27  Corinna Vinschen  <corinna@vinschen.de>
 
        * dll_init.cc (dll_list::topsort): Fix early-return condition to

diff --git a/winsup/cygwin/fhandler_procsys.cc b/winsup/cygwin/fhandler_procsys.cc
index 6bd52da272455002b4b123eba13cb4363a3d2490..759712f046e8157e7c4c92e537789463935a7b9b 100644 (file)
--- a/winsup/cygwin/fhandler_procsys.cc
+++ b/winsup/cygwin/fhandler_procsys.cc
@@ -394,26 +394,12 @@ fhandler_procsys::closedir (DIR *dir)
 void __reg3
 fhandler_procsys::read (void *ptr, size_t& len)
 {
-  NTSTATUS status;
-  IO_STATUS_BLOCK io;
-  LARGE_INTEGER off = { QuadPart:0LL };
-
-  /* FIXME: Implement nonblocking I/O, interruptibility and cancelability. */
-  status = NtReadFile (get_handle (), NULL, NULL, NULL, &io, ptr, len,
-                      &off, NULL);
-  if (!NT_SUCCESS (status))
-    {
-      __seterrno_from_nt_status (status);
-      len = -1;
-    }
-  else
-    len = io.Information;
+  fhandler_base::raw_read (ptr, len);
 }
 
 ssize_t __stdcall
 fhandler_procsys::write (const void *ptr, size_t len)
 {
-  /* FIXME: Implement nonblocking I/O, interruptibility and cancelability. */
   return fhandler_base::raw_write (ptr, len);
 }
 

diff --git a/winsup/cygwin/release/1.7.19 b/winsup/cygwin/release/1.7.19
index 6b6c883beeacb4981cca6e54ac9683d4804f9f14..30495e9c690880c9fd667510ac2a79c33178eea9 100644 (file)
--- a/winsup/cygwin/release/1.7.19
+++ b/winsup/cygwin/release/1.7.19
@@ -31,3 +31,6 @@ Bug fixes:
 - Fix an incorrect condition which breaks fork after all dlopen'ed DLLs
   have already been dlclose'd.
   Fixes: http://cygwin.com/ml/cygwin/2013-05/msg00376.html
+
+- Fix buggy usage of NtReadFile when reading from device under /proc/sys.
+  Fixes: http://cygwin.com/ml/cygwin/2013-05/msg00392.html