zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-08 21:09:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 377698 - Missing memory check for futex() uaddr arg for FUTEX_WAKE,

Browse Source 
and FUTEX_WAKE_BITSET, check only 4 args for FUTEX_WAKE_BITSET,
and 2 args for FUTEX_TRYLOCK_PI.
Fixes BZ#377698.
Patch by: diane.meirowitz@oracle.com


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16285
This commit is contained in:
Ivo Raisr
2017-03-23 23:22:21 +00:00
parent e21ebbcae5
commit d9f02db4c8
7 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
coregrind/m_syswrap/syswrap-linux.c
View File

@@ -1610,9 +1610,11 @@ PRE(sys_futex)
}
break;
case VKI_FUTEX_WAKE_BITSET:
PRE_REG_READ6(long, "futex",
vki_u32 *, futex, int, op, int, val,
int, dummy, int, dummy2, int, val3);
PRE_REG_READ3(long, "futex",
vki_u32 *, futex, int, op, int, val);
if (VG_(tdict).track_pre_reg_read) {
PRA6("futex", int, val3);
}
break;
case VKI_FUTEX_WAIT:
case VKI_FUTEX_LOCK_PI:
@@ -1622,10 +1624,10 @@ PRE(sys_futex)
break;
case VKI_FUTEX_WAKE:
case VKI_FUTEX_FD:
case VKI_FUTEX_TRYLOCK_PI:
PRE_REG_READ3(long, "futex",
vki_u32 *, futex, int, op, int, val);
break;
case VKI_FUTEX_TRYLOCK_PI:
case VKI_FUTEX_UNLOCK_PI:
default:
PRE_REG_READ2(long, "futex", vki_u32 *, futex, int, op);
@@ -1655,13 +1657,10 @@ PRE(sys_futex)
case VKI_FUTEX_FD:
case VKI_FUTEX_TRYLOCK_PI:
case VKI_FUTEX_UNLOCK_PI:
PRE_MEM_READ( "futex(futex)", ARG1, sizeof(Int) );
break;
case VKI_FUTEX_WAKE:
case VKI_FUTEX_WAKE_BITSET:
/* no additional pointers */
break;
PRE_MEM_READ( "futex(futex)", ARG1, sizeof(Int) );
break;
default:
SET_STATUS_Failure( VKI_ENOSYS ); // some futex function we don't understand