Fix bug in and simply parameter access checks for pthread_sigmask.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@429

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index c675a83983d6a1cd82d7faba97d4f8ad9b433c90..7bc9de586ba36ba39ccec63942ba27b65bcbb6af 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -2920,16 +2920,14 @@ void do_pthread_sigmask ( ThreadId tid,
 
    if (VG_(clo_instrument)) {
       /* check newmask/oldmask are addressible/defined */
-      if (VG_(clo_instrument)
-          && newmask
+      if (newmask
           && !VGM_(check_readable)( (Addr)newmask, 
                                     sizeof(vki_ksigset_t), NULL))
          VG_(record_pthread_err)( tid, 
             "pthread_sigmask: newmask contains "
             "unaddressible or undefined bytes");
-      if (VG_(clo_instrument)
-          && oldmask
-          && !VGM_(check_readable)( (Addr)oldmask, 
+      if (oldmask
+          && !VGM_(check_writable)( (Addr)oldmask, 
                                     sizeof(vki_ksigset_t), NULL))
          VG_(record_pthread_err)( tid, 
             "pthread_sigmask: oldmask contains "

diff --git a/vg_scheduler.c b/vg_scheduler.c
index c675a83983d6a1cd82d7faba97d4f8ad9b433c90..7bc9de586ba36ba39ccec63942ba27b65bcbb6af 100644 (file)
--- a/vg_scheduler.c
+++ b/vg_scheduler.c
@@ -2920,16 +2920,14 @@ void do_pthread_sigmask ( ThreadId tid,
 
    if (VG_(clo_instrument)) {
       /* check newmask/oldmask are addressible/defined */
-      if (VG_(clo_instrument)
-          && newmask
+      if (newmask
           && !VGM_(check_readable)( (Addr)newmask, 
                                     sizeof(vki_ksigset_t), NULL))
          VG_(record_pthread_err)( tid, 
             "pthread_sigmask: newmask contains "
             "unaddressible or undefined bytes");
-      if (VG_(clo_instrument)
-          && oldmask
-          && !VGM_(check_readable)( (Addr)oldmask, 
+      if (oldmask
+          && !VGM_(check_writable)( (Addr)oldmask, 
                                     sizeof(vki_ksigset_t), NULL))
          VG_(record_pthread_err)( tid, 
             "pthread_sigmask: oldmask contains "