diff --git a/NEWS b/NEWS index 44b1887c1..86c6d8642 100644 --- a/NEWS +++ b/NEWS @@ -48,6 +48,7 @@ where XXXXXX is the bug number as listed below. 329612 Incorrect handling of AT_BASE for image execution 330459 --track-fds=yes doesn't track eventfds 330469 Add clock_adjtime syscall support +330941 Typo in PRE(poll) syscall wrapper Release 3.9.0 (31 October 2013) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c index d852f2d6c..6587a0eaf 100644 --- a/coregrind/m_syswrap/syswrap-generic.c +++ b/coregrind/m_syswrap/syswrap-generic.c @@ -3785,7 +3785,7 @@ PRE(sys_poll) (Addr)(&ufds[i].fd), sizeof(ufds[i].fd) ); PRE_MEM_READ( "poll(ufds.events)", (Addr)(&ufds[i].events), sizeof(ufds[i].events) ); - PRE_MEM_WRITE( "poll(ufds.reventss)", + PRE_MEM_WRITE( "poll(ufds.revents)", (Addr)(&ufds[i].revents), sizeof(ufds[i].revents) ); } } diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c index b50cdd89d..dc5923900 100644 --- a/coregrind/m_syswrap/syswrap-linux.c +++ b/coregrind/m_syswrap/syswrap-linux.c @@ -1269,7 +1269,7 @@ PRE(sys_ppoll) (Addr)(&ufds[i].fd), sizeof(ufds[i].fd) ); PRE_MEM_READ( "ppoll(ufds.events)", (Addr)(&ufds[i].events), sizeof(ufds[i].events) ); - PRE_MEM_WRITE( "ppoll(ufd.reventss)", + PRE_MEM_WRITE( "ppoll(ufd.revents)", (Addr)(&ufds[i].revents), sizeof(ufds[i].revents) ); } diff --git a/memcheck/tests/badpoll.stderr.exp b/memcheck/tests/badpoll.stderr.exp index b03d54d52..5ea9c7936 100644 --- a/memcheck/tests/badpoll.stderr.exp +++ b/memcheck/tests/badpoll.stderr.exp @@ -5,7 +5,7 @@ Syscall param poll(ufds.fd) points to uninitialised byte(s) at 0x........: malloc (vg_replace_malloc.c:...) by 0x........: main (badpoll.c:12) -Syscall param poll(ufds.reventss) points to unaddressable byte(s) +Syscall param poll(ufds.revents) points to unaddressable byte(s) ... by 0x........: main (badpoll.c:22) Address 0x........ is 0 bytes after a block of size 15 alloc'd diff --git a/memcheck/tests/x86-linux/scalar.stderr.exp b/memcheck/tests/x86-linux/scalar.stderr.exp index 54616dbaf..e1a2bf219 100644 --- a/memcheck/tests/x86-linux/scalar.stderr.exp +++ b/memcheck/tests/x86-linux/scalar.stderr.exp @@ -2008,7 +2008,7 @@ Syscall param poll(ufds.events) points to unaddressable byte(s) by 0x........: main (scalar.c:752) Address 0x........ is not stack'd, malloc'd or (recently) free'd -Syscall param poll(ufds.reventss) points to unaddressable byte(s) +Syscall param poll(ufds.revents) points to unaddressable byte(s) ... by 0x........: main (scalar.c:752) Address 0x........ is not stack'd, malloc'd or (recently) free'd