Merge lp:~jtaylor/ubuntu/quantal/valgrind/various-fixes into lp:ubuntu/quantal/valgrind

[Julian Taylor]

fixes a couple issues, the buffer overflow is essential as vgdb will break when rebuilt otherwise.
all are relevant for an precise SRU see the associated bugs

[Micah Gersten (micahg)]

Looks fine, as it's bug fix, sponsoring

review: Approve

[Micah Gersten (micahg)]

uploaded, waiting in queue

[Martin Pitt (pitti)]

This is in quantal, apparently Micah didn't push the branch. Closing manually. Thanks!

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-17 12:29:21 +0000
+++ debian/changelog	2012-10-05 20:36:26 +0000
@@ -1,3 +1,11 @@
+valgrind (1:3.7.0-0ubuntu4) quantal; urgency=low
+
+  * fix-buffer-overflows.patch: fix overflows in vgdb
+  * 05_fix-callgrind_control.patch: fix valgrind process name (LP: #1036283)
+  * fix-VEX-PCMPxSTRx.patch: fix strstr handling (LP: #1027977)
+
+ -- Julian Taylor <[e-mail]>  Fri, 05 Oct 2012 20:16:28 +0200
+
 valgrind (1:3.7.0-0ubuntu3) precise; urgency=low
 
   * Add uinput ioctl wrappers to fix false positive errors. (LP: #958095)
 
=== added file 'debian/patches/05_fix-callgrind_control.patch'
--- debian/patches/05_fix-callgrind_control.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/05_fix-callgrind_control.patch	2012-10-05 20:36:26 +0000
@@ -0,0 +1,18 @@
+Description: Fix callgrind_control that should look for valgrind.bin and not valgrind
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/659215
+Author: Pierre Habouzit <[e-mail]>
+Reviewed-by: Alessandro Ghedini <[e-mail]>
+Last-Update: 2012-05-10
+
+--- a/callgrind/callgrind_control.in
++++ b/callgrind/callgrind_control.in
+@@ -29,7 +29,7 @@
+   @pids = ();
+   open LIST, "vgdb -l|";
+   while(<LIST>) {
+-      if (/^use --pid=(\d+) for \S*?valgrind\s+(.*?)\s*$/) {
++      if (/^use --pid=(\d+) for \S*?valgrind\.bin\s+(.*?)\s*$/) {
+ 	  $pid = $1;
+ 	  $cmd = $2;
+ 	  if (!($cmd =~ /--tool=callgrind/)) { next; }
 
=== added file 'debian/patches/fix-VEX-PCMPxSTRx.patch'
--- debian/patches/fix-VEX-PCMPxSTRx.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-VEX-PCMPxSTRx.patch	2012-10-05 20:36:26 +0000
@@ -0,0 +1,33 @@
+Description: upstream patch, modified to fit version 3.7.0
+ Emulation of PCMPxSTRx mode 0x0C was wrong
+ for searching an empty needle in an empty haystack.
+Applied-Upstream: 3.8.0
+Origin: r2447
+Author: Josef Weidendorfer <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/valgrind/+bug/1027977
+Bug: https://bugs.kde.org/show_bug.cgi?id=303963
+
+diff --git a/VEX/priv/guest_generic_x87.c b/VEX/priv/guest_generic_x87.c
+index a10f869..ae627f6 100644
+--- a/VEX/priv/guest_generic_x87.c
++++ b/VEX/priv/guest_generic_x87.c
+@@ -815,9 +815,6 @@ Bool compute_PCMPxSTRx ( /*OUT*/V128* resV,
+       UInt   validL  = ~(zmaskL | -zmaskL);  // not(left(zmaskL))
+       UInt   validR  = ~(zmaskR | -zmaskR);  // not(left(zmaskR))
+       for (hi = 0; hi < 16; hi++) {
+-         if ((validL & (1 << hi)) == 0)
+-            // run off the end of the haystack
+-            break;
+          UInt m = 1;
+          for (ni = 0; ni < 16; ni++) {
+             if ((validR & (1 << ni)) == 0) break;
+@@ -826,6 +826,9 @@ Bool compute_PCMPxSTRx ( /*OUT*/V128* resV,
+             if (argL[i] != argR[ni]) { m = 0; break; }
+          }
+          boolRes |= (m << hi);
++         if ((validL & (1 << hi)) == 0)
++            // run off the end of the haystack
++            break;
+       }
+ 
+       // boolRes is "pre-invalidated"
 
=== added file 'debian/patches/fix-buffer-overflows.patch'
--- debian/patches/fix-buffer-overflows.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-buffer-overflows.patch	2012-10-05 20:36:26 +0000
@@ -0,0 +1,59 @@
+Description: fix a couple of overflows
+Origin: r12319, r12493
+Applied-Upstream: 3.8.0
+
+--- a/coregrind/vgdb.c
++++ b/coregrind/vgdb.c
+@@ -1364,7 +1364,7 @@
+ static
+ Bool read_from_gdb_write_to_pid(int to_pid)
+ {
+-   char buf[PBUFSIZ];
++   char buf[PBUFSIZ+1]; // +1 for trailing \0
+    int nrread;
+ 
+    nrread = read_buf(from_gdb, buf, "from gdb on stdin");
+@@ -1388,7 +1388,7 @@
+ static
+ Bool read_from_pid_write_to_gdb(int from_pid)
+ {
+-   char buf[PBUFSIZ];
++   char buf[PBUFSIZ+1]; // +1 for trailing \0
+    int nrread;
+ 
+    nrread = read_buf(from_pid, buf, "from pid");
+@@ -1493,14 +1493,14 @@
+ static int
+ readchar (int fd)
+ {
+-  static unsigned char buf[PBUFSIZ];
++  static unsigned char buf[PBUFSIZ+1]; // +1 for trailing \0
+   static int bufcnt = 0;
+   static unsigned char *bufp;
+ 
+   if (bufcnt-- > 0)
+      return *bufp++;
+ 
+-  bufcnt = read (fd, buf, sizeof (buf));
++  bufcnt = read_buf (fd, buf, "static buf readchar");
+ 
+   if (bufcnt <= 0) {
+      if (bufcnt == 0) {
+@@ -1874,7 +1874,7 @@
+    unsigned char hex[3];
+    unsigned char cksum;
+    unsigned char *hexcommand;
+-   unsigned char buf[PBUFSIZ];
++   unsigned char buf[PBUFSIZ+1]; // +1 for trailing \0
+    int buflen;
+    int nc;
+ 
+@@ -2151,7 +2151,7 @@
+          errno = 0; /* avoid complain if vgdb_dir is empty */
+          while ((f = readdir (vgdb_dir))) {
+             struct stat st;
+-            char pathname[strlen(vgdb_dir_name) + strlen(f->d_name)];
++            char pathname[strlen(vgdb_dir_name) + strlen(f->d_name) + 1];
+             char *wrongpid;
+             int newpid;
+ 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-17 12:29:21 +0000
+++ debian/patches/series	2012-10-05 20:36:26 +0000
@@ -5,3 +5,6 @@
 0009-glibc-215.patch
 0010-automake-1.11.2.patch
 0011-uinput-ioctls.patch
+fix-buffer-overflows.patch
+05_fix-callgrind_control.patch
+fix-VEX-PCMPxSTRx.patch