From MAILER-DAEMON Thu Jan 01 22:13:17 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Y6sft-0004RQ-F4
	for mharc-grep-commit@gnu.org; Thu, 01 Jan 2015 22:13:17 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47998)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1Y6sfq-0004RF-Tp
	for grep-commit@gnu.org; Thu, 01 Jan 2015 22:13:16 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1Y6sfp-0006XZ-9u
	for grep-commit@gnu.org; Thu, 01 Jan 2015 22:13:14 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:49163)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1Y6sfp-0006XQ-61
	for grep-commit@gnu.org; Thu, 01 Jan 2015 22:13:13 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1Y6sfo-0002Ep-6J
	for grep-commit@gnu.org; Fri, 02 Jan 2015 03:13:12 +0000
Date: Fri, 02 Jan 2015 03:13:12 +0000
Message-Id: <E1Y6sfo-0002Ep-6J@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.21-11-gc2d0489
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4aed929ac46fae52b47990190d3ffa16fae233b0
X-Git-Newrev: c2d0489c43264b25f063058c4c34a66e2445abae
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jan 2015 03:13:16 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  c2d0489c43264b25f063058c4c34a66e2445abae (commit)
       via  d433dad3f4183eba763f73345055ba4800cdef43 (commit)
      from  4aed929ac46fae52b47990190d3ffa16fae233b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c2d0489c43264b25f063058c4c34a66e2445abae


commit c2d0489c43264b25f063058c4c34a66e2445abae
Author: Jim Meyering <meyering@fb.com>
Date:   Thu Jan 1 18:50:53 2015 -0800

    gnulib: update to latest

diff --git a/gnulib b/gnulib
index 46d015f..aecd387 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 46d015f9c3c959d2d9b9c3b9e9c99f3f420277b0
+Subproject commit aecd38787af5ca0000e184912194e8c83123eb7f

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=d433dad3f4183eba763f73345055ba4800cdef43


commit c2d0489c43264b25f063058c4c34a66e2445abae
Author: Jim Meyering <meyering@fb.com>
Date:   Thu Jan 1 18:50:53 2015 -0800

    gnulib: update to latest

diff --git a/gnulib b/gnulib
index 46d015f..aecd387 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 46d015f9c3c959d2d9b9c3b9e9c99f3f420277b0
+Subproject commit aecd38787af5ca0000e184912194e8c83123eb7f

-----------------------------------------------------------------------

Summary of changes:
 AUTHORS                                    |    2 +-
 ChangeLog-2009                             |    2 +-
 HACKING                                    |    2 +-
 Makefile.am                                |    2 +-
 NEWS                                       |    2 +-
 README                                     |    2 +-
 README-alpha                               |    2 +-
 README-hacking                             |    2 +-
 TODO                                       |    2 +-
 bootstrap                                  |    2 +-
 bootstrap.conf                             |    2 +-
 cfg.mk                                     |    2 +-
 configure.ac                               |    2 +-
 doc/Makefile.am                            |    2 +-
 doc/grep.in.1                              |    2 +-
 doc/grep.texi                              |    2 +-
 gnulib                                     |    2 +-
 lib/Makefile.am                            |    2 +-
 lib/colorize-posix.c                       |    2 +-
 lib/colorize-w32.c                         |    2 +-
 lib/colorize.h                             |    2 +-
 m4/pcre.m4                                 |    2 +-
 po/POTFILES.in                             |    2 +-
 src/Makefile.am                            |    2 +-
 src/dfa.c                                  |    2 +-
 src/dfa.h                                  |    2 +-
 src/dfasearch.c                            |    2 +-
 src/dosbuf.c                               |    2 +-
 src/grep.c                                 |    2 +-
 src/grep.h                                 |    2 +-
 src/kwsearch.c                             |    2 +-
 src/kwset.c                                |    2 +-
 src/kwset.h                                |    2 +-
 src/pcresearch.c                           |    2 +-
 src/search.h                               |    2 +-
 src/searchutils.c                          |    2 +-
 src/system.h                               |    2 +-
 tests/Makefile.am                          |    2 +-
 tests/backref                              |    2 +-
 tests/backslash-s-and-repetition-operators |    2 +-
 tests/backslash-s-vs-invalid-multitype     |    2 +-
 tests/bre                                  |    2 +-
 tests/bre.awk                              |    2 +-
 tests/case-fold-titlecase                  |    2 +-
 tests/count-newline                        |    2 +-
 tests/dfa-coverage                         |    2 +-
 tests/dfa-heap-overrun                     |    2 +-
 tests/dfa-match                            |    2 +-
 tests/dfa-match-aux.c                      |    2 +-
 tests/empty                                |    2 +-
 tests/empty-line-mb                        |    2 +-
 tests/ere                                  |    2 +-
 tests/ere.awk                              |    2 +-
 tests/file                                 |    2 +-
 tests/fmbtest                              |    2 +-
 tests/foad1                                |    2 +-
 tests/get-mb-cur-max.c                     |    2 +-
 tests/help-version                         |    2 +-
 tests/high-bit-range                       |    2 +-
 tests/init.sh                              |    2 +-
 tests/khadafy                              |    2 +-
 tests/match-lines                          |    2 +-
 tests/mb-dot-newline                       |    2 +-
 tests/mb-non-UTF8-overrun                  |    2 +-
 tests/mb-non-UTF8-performance              |    2 +-
 tests/multibyte-white-space                |    2 +-
 tests/multiple-begin-or-end-line           |    2 +-
 tests/null-byte                            |    2 +-
 tests/options                              |    2 +-
 tests/pcre                                 |    2 +-
 tests/pcre-abort                           |    2 +-
 tests/pcre-infloop                         |    2 +-
 tests/pcre-invalid-utf8-input              |    2 +-
 tests/pcre-o                               |    2 +-
 tests/pcre-utf8                            |    2 +-
 tests/pcre-w                               |    2 +-
 tests/pcre-wx-backref                      |    2 +-
 tests/posix-bracket                        |    2 +-
 tests/spencer1                             |    2 +-
 tests/spencer1-locale                      |    2 +-
 tests/spencer1-locale.awk                  |    2 +-
 tests/spencer1.awk                         |    2 +-
 tests/spencer2                             |    2 +-
 tests/status                               |    2 +-
 tests/surrogate-pair                       |    2 +-
 tests/symlink                              |    2 +-
 tests/tests                                |    2 +-
 tests/triple-backref                       |    2 +-
 tests/turkish-I                            |    2 +-
 tests/turkish-I-without-dot                |    2 +-
 tests/turkish-eyes                         |    2 +-
 tests/unibyte-bracket-expr                 |    2 +-
 tests/unibyte-negated-circumflex           |    2 +-
 tests/yesno                                |    2 +-
 94 files changed, 94 insertions(+), 94 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Sun Jan 11 20:47:53 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YAU6j-0002cI-9E
	for mharc-grep-commit@gnu.org; Sun, 11 Jan 2015 20:47:53 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45529)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1YAU6f-0002Xq-Un
	for grep-commit@gnu.org; Sun, 11 Jan 2015 20:47:52 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1YAU6d-0001Jr-9N
	for grep-commit@gnu.org; Sun, 11 Jan 2015 20:47:49 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50118)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1YAU6d-0001Jn-5L
	for grep-commit@gnu.org; Sun, 11 Jan 2015 20:47:47 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1YAU6c-0006vq-7W
	for grep-commit@gnu.org; Mon, 12 Jan 2015 01:47:46 +0000
Date: Mon, 12 Jan 2015 01:47:46 +0000
Message-Id: <E1YAU6c-0006vq-7W@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.21-14-g1555185
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c2d0489c43264b25f063058c4c34a66e2445abae
X-Git-Newrev: 1555185d5b7867472b0e5f0589f71d9b1242e842
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2015 01:47:52 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  1555185d5b7867472b0e5f0589f71d9b1242e842 (commit)
       via  83a95bd8c8561875b948cadd417c653dbe7ef2e2 (commit)
       via  9aedd79729193d57939dd171850eb2d44d28eecb (commit)
      from  c2d0489c43264b25f063058c4c34a66e2445abae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=1555185d5b7867472b0e5f0589f71d9b1242e842


commit 1555185d5b7867472b0e5f0589f71d9b1242e842
Author: Jim Meyering <meyering@fb.com>
Date:   Sun Jan 4 07:28:13 2015 -0800

    tests: add support for ASAN memory poisoning
    
    This lets us reliably detect with ASAN some UMR bugs
    that would otherwise be detectable only some of the time
    with MSAN.  Use __asan_poison_memory_region to mark the unused
    portion of a read buffer as inaccessible.  Then, with ASAN,
    any attempt to access those bytes results in an ASAN abort.
    * src/system.h: Include "ignore-value.h".
    (__has_feature): Define.
    (HAVE_ASAN): Define when address sanitizer is enabled.
    [HAVE_ASAN]: Declare these two __asan_* symbols.
    [!HAVE_ASAN] (__asan_poison_memory_region): Define stub.
    [!HAVE_ASAN] (__asan_unpoison_memory_region): Likewise.
    * src/grep.c: Use __asan_poison_memory_region.

diff --git a/src/grep.c b/src/grep.c
index c85fc6e..7d70f4a 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -816,6 +816,11 @@ fillbuf (size_t save, struct stat const *st)
      positive reports of these bytes being used uninitialized.  */
   memset (buflim, 0, sizeof (uword));
 
+  /* Mark the part of the buffer not filled by the read or set by
+     the above memset call as ASAN-poisoned.  */
+  __asan_poison_memory_region (buflim + sizeof (uword),
+                               bufalloc - (buflim - buffer) - sizeof (uword));
+
   return cc;
 }
 
diff --git a/src/system.h b/src/system.h
index 1cc2bd3..15a1abb 100644
--- a/src/system.h
+++ b/src/system.h
@@ -26,6 +26,7 @@
 #include "binary-io.h"
 #include "configmake.h"
 #include "dirname.h"
+#include "ignore-value.h"
 #include "minmax.h"
 #include "same-inode.h"
 
@@ -67,4 +68,43 @@ to_uchar (char ch)
 
 _GL_INLINE_HEADER_END
 
+#ifndef __has_feature
+# define __has_feature(F) false
+#endif
+
+#if defined __SANITIZE_ADDRESS__ || __has_feature (address_sanitizer)
+# define HAVE_ASAN 1
+#else
+# define HAVE_ASAN 0
+#endif
+
+#if HAVE_ASAN
+
+/* Mark memory region [addr, addr+size) as unaddressable.
+   This memory must be previously allocated by the user program.  Accessing
+   addresses in this region from instrumented code is forbidden until
+   this region is unpoisoned.  This function is not guaranteed to poison
+   the whole region - it may poison only a subregion of [addr, addr+size)
+   due to ASan alignment restrictions.
+   Method is NOT thread-safe in the sense that no two threads can
+   (un)poison memory in the same memory region simultaneously.  */
+void __asan_poison_memory_region (void const volatile *addr, size_t size);
+
+/* Mark memory region [addr, addr+size) as addressable.
+   This memory must be previously allocated by the user program.  Accessing
+   addresses in this region is allowed until this region is poisoned again.
+   This function may unpoison a superregion of [addr, addr+size) due to
+   ASan alignment restrictions.
+   Method is NOT thread-safe in the sense that no two threads can
+   (un)poison memory in the same memory region simultaneously.  */
+void __asan_unpoison_memory_region (void const volatile *addr, size_t size);
+
+#else
+
+static _GL_UNUSED void
+__asan_poison_memory_region (void const volatile *addr, size_t size) { }
+static _GL_UNUSED void
+__asan_unpoison_memory_region (void const volatile *addr, size_t size) { }
+#endif
+
 #endif

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=83a95bd8c8561875b948cadd417c653dbe7ef2e2


commit 1555185d5b7867472b0e5f0589f71d9b1242e842
Author: Jim Meyering <meyering@fb.com>
Date:   Sun Jan 4 07:28:13 2015 -0800

    tests: add support for ASAN memory poisoning
    
    This lets us reliably detect with ASAN some UMR bugs
    that would otherwise be detectable only some of the time
    with MSAN.  Use __asan_poison_memory_region to mark the unused
    portion of a read buffer as inaccessible.  Then, with ASAN,
    any attempt to access those bytes results in an ASAN abort.
    * src/system.h: Include "ignore-value.h".
    (__has_feature): Define.
    (HAVE_ASAN): Define when address sanitizer is enabled.
    [HAVE_ASAN]: Declare these two __asan_* symbols.
    [!HAVE_ASAN] (__asan_poison_memory_region): Define stub.
    [!HAVE_ASAN] (__asan_unpoison_memory_region): Likewise.
    * src/grep.c: Use __asan_poison_memory_region.

diff --git a/src/grep.c b/src/grep.c
index c85fc6e..7d70f4a 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -816,6 +816,11 @@ fillbuf (size_t save, struct stat const *st)
      positive reports of these bytes being used uninitialized.  */
   memset (buflim, 0, sizeof (uword));
 
+  /* Mark the part of the buffer not filled by the read or set by
+     the above memset call as ASAN-poisoned.  */
+  __asan_poison_memory_region (buflim + sizeof (uword),
+                               bufalloc - (buflim - buffer) - sizeof (uword));
+
   return cc;
 }
 
diff --git a/src/system.h b/src/system.h
index 1cc2bd3..15a1abb 100644
--- a/src/system.h
+++ b/src/system.h
@@ -26,6 +26,7 @@
 #include "binary-io.h"
 #include "configmake.h"
 #include "dirname.h"
+#include "ignore-value.h"
 #include "minmax.h"
 #include "same-inode.h"
 
@@ -67,4 +68,43 @@ to_uchar (char ch)
 
 _GL_INLINE_HEADER_END
 
+#ifndef __has_feature
+# define __has_feature(F) false
+#endif
+
+#if defined __SANITIZE_ADDRESS__ || __has_feature (address_sanitizer)
+# define HAVE_ASAN 1
+#else
+# define HAVE_ASAN 0
+#endif
+
+#if HAVE_ASAN
+
+/* Mark memory region [addr, addr+size) as unaddressable.
+   This memory must be previously allocated by the user program.  Accessing
+   addresses in this region from instrumented code is forbidden until
+   this region is unpoisoned.  This function is not guaranteed to poison
+   the whole region - it may poison only a subregion of [addr, addr+size)
+   due to ASan alignment restrictions.
+   Method is NOT thread-safe in the sense that no two threads can
+   (un)poison memory in the same memory region simultaneously.  */
+void __asan_poison_memory_region (void const volatile *addr, size_t size);
+
+/* Mark memory region [addr, addr+size) as addressable.
+   This memory must be previously allocated by the user program.  Accessing
+   addresses in this region is allowed until this region is poisoned again.
+   This function may unpoison a superregion of [addr, addr+size) due to
+   ASan alignment restrictions.
+   Method is NOT thread-safe in the sense that no two threads can
+   (un)poison memory in the same memory region simultaneously.  */
+void __asan_unpoison_memory_region (void const volatile *addr, size_t size);
+
+#else
+
+static _GL_UNUSED void
+__asan_poison_memory_region (void const volatile *addr, size_t size) { }
+static _GL_UNUSED void
+__asan_unpoison_memory_region (void const volatile *addr, size_t size) { }
+#endif
+
 #endif

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=9aedd79729193d57939dd171850eb2d44d28eecb


commit 1555185d5b7867472b0e5f0589f71d9b1242e842
Author: Jim Meyering <meyering@fb.com>
Date:   Sun Jan 4 07:28:13 2015 -0800

    tests: add support for ASAN memory poisoning
    
    This lets us reliably detect with ASAN some UMR bugs
    that would otherwise be detectable only some of the time
    with MSAN.  Use __asan_poison_memory_region to mark the unused
    portion of a read buffer as inaccessible.  Then, with ASAN,
    any attempt to access those bytes results in an ASAN abort.
    * src/system.h: Include "ignore-value.h".
    (__has_feature): Define.
    (HAVE_ASAN): Define when address sanitizer is enabled.
    [HAVE_ASAN]: Declare these two __asan_* symbols.
    [!HAVE_ASAN] (__asan_poison_memory_region): Define stub.
    [!HAVE_ASAN] (__asan_unpoison_memory_region): Likewise.
    * src/grep.c: Use __asan_poison_memory_region.

diff --git a/src/grep.c b/src/grep.c
index c85fc6e..7d70f4a 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -816,6 +816,11 @@ fillbuf (size_t save, struct stat const *st)
      positive reports of these bytes being used uninitialized.  */
   memset (buflim, 0, sizeof (uword));
 
+  /* Mark the part of the buffer not filled by the read or set by
+     the above memset call as ASAN-poisoned.  */
+  __asan_poison_memory_region (buflim + sizeof (uword),
+                               bufalloc - (buflim - buffer) - sizeof (uword));
+
   return cc;
 }
 
diff --git a/src/system.h b/src/system.h
index 1cc2bd3..15a1abb 100644
--- a/src/system.h
+++ b/src/system.h
@@ -26,6 +26,7 @@
 #include "binary-io.h"
 #include "configmake.h"
 #include "dirname.h"
+#include "ignore-value.h"
 #include "minmax.h"
 #include "same-inode.h"
 
@@ -67,4 +68,43 @@ to_uchar (char ch)
 
 _GL_INLINE_HEADER_END
 
+#ifndef __has_feature
+# define __has_feature(F) false
+#endif
+
+#if defined __SANITIZE_ADDRESS__ || __has_feature (address_sanitizer)
+# define HAVE_ASAN 1
+#else
+# define HAVE_ASAN 0
+#endif
+
+#if HAVE_ASAN
+
+/* Mark memory region [addr, addr+size) as unaddressable.
+   This memory must be previously allocated by the user program.  Accessing
+   addresses in this region from instrumented code is forbidden until
+   this region is unpoisoned.  This function is not guaranteed to poison
+   the whole region - it may poison only a subregion of [addr, addr+size)
+   due to ASan alignment restrictions.
+   Method is NOT thread-safe in the sense that no two threads can
+   (un)poison memory in the same memory region simultaneously.  */
+void __asan_poison_memory_region (void const volatile *addr, size_t size);
+
+/* Mark memory region [addr, addr+size) as addressable.
+   This memory must be previously allocated by the user program.  Accessing
+   addresses in this region is allowed until this region is poisoned again.
+   This function may unpoison a superregion of [addr, addr+size) due to
+   ASan alignment restrictions.
+   Method is NOT thread-safe in the sense that no two threads can
+   (un)poison memory in the same memory region simultaneously.  */
+void __asan_unpoison_memory_region (void const volatile *addr, size_t size);
+
+#else
+
+static _GL_UNUSED void
+__asan_poison_memory_region (void const volatile *addr, size_t size) { }
+static _GL_UNUSED void
+__asan_unpoison_memory_region (void const volatile *addr, size_t size) { }
+#endif
+
 #endif

-----------------------------------------------------------------------

Summary of changes:
 NEWS                                       |    5 +++
 THANKS.in                                  |    1 +
 src/grep.c                                 |   11 +++++++
 src/kwset.c                                |    2 +
 src/system.h                               |   40 ++++++++++++++++++++++++++++
 tests/Makefile.am                          |    1 +
 tests/{mb-non-UTF8-overrun => kwset-abuse} |   22 ++++++++-------
 7 files changed, 72 insertions(+), 10 deletions(-)
 copy tests/{mb-non-UTF8-overrun => kwset-abuse} (58%)


hooks/post-receive
-- 
grep


