Author: aurel32
Date: 2014-05-05 13:05:43 +0000 (Mon, 05 May 2014)
New Revision: 6045

Added:
   
glibc-package/trunk/debian/patches/any/submitted-ptsname_r-uninitialized-memory.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
patches/any/submitted-ptsname_r-uninitialized-memory.diff: new patch to
fix uninitialized memory in ptsname_r().  Closes: #741482.

Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2014-05-05 13:05:41 UTC (rev 
6044)
+++ glibc-package/trunk/debian/changelog        2014-05-05 13:05:43 UTC (rev 
6045)
@@ -21,6 +21,8 @@
     dynamic library loader.  Closes: #745552.
   * patches/localedata/submitted-it_IT-thousands_sep.diff: new patch to define
     the thousands separator for the it_IT locale.  Closes: #712157.
+  * patches/any/submitted-ptsname_r-uninitialized-memory.diff: new patch to
+    fix uninitialized memory in ptsname_r().  Closes: #741482.
 
  -- Adam Conrad <[email protected]>  Sun, 27 Apr 2014 23:15:13 -0600
 

Added: 
glibc-package/trunk/debian/patches/any/submitted-ptsname_r-uninitialized-memory.diff
===================================================================
--- 
glibc-package/trunk/debian/patches/any/submitted-ptsname_r-uninitialized-memory.diff
                                (rev 0)
+++ 
glibc-package/trunk/debian/patches/any/submitted-ptsname_r-uninitialized-memory.diff
        2014-05-05 13:05:43 UTC (rev 6045)
@@ -0,0 +1,20 @@
+2014-05-05  Aurelien Jarno  <[email protected]>
+
+       * sysdeps/unix/sysv/linux/ptsname.c (__ptsname_internal): return
+       errno if the TIOCGPTN ioctl fails with an error different than
+       EINVAL.
+
+diff --git a/sysdeps/unix/sysv/linux/ptsname.c 
b/sysdeps/unix/sysv/linux/ptsname.c
+--- a/sysdeps/unix/sysv/linux/ptsname.c
++++ b/sysdeps/unix/sysv/linux/ptsname.c
+@@ -105,7 +105,9 @@ __ptsname_internal (int fd, char *buf, size_t buflen, 
struct stat64 *stp)
+ 
+       memcpy (__stpcpy (buf, devpts), p, &numbuf[sizeof (numbuf)] - p);
+     }
+-  else if (errno == EINVAL)
++  else if (errno != EINVAL)
++    return errno;
++  else
+ #endif
+     {
+       char *p;

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series   2014-05-05 13:05:41 UTC (rev 
6044)
+++ glibc-package/trunk/debian/patches/series   2014-05-05 13:05:43 UTC (rev 
6045)
@@ -277,3 +277,4 @@
 any/cvs-make-4.0.diff
 any/cvs-wprintf.diff
 any/cvs-resolv-first-query-failure.diff
+any/submitted-ptsname_r-uninitialized-memory.diff


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: https://lists.debian.org/[email protected]

Reply via email to