From ae393011f39e358ed82764bda7f48b9ac2e7424f Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Mon, 26 Jan 2009 12:41:31 +0000 Subject: [PATCH] merge: r8957 The SG_GET_VERSION_NUM ioctl writes to memory rather than reading it. r8958 The SG_GET_TIMEOUT ioctl doesn't write to memory - it returns the timeout via it's return value. git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_4_BRANCH@9066 --- coregrind/m_syswrap/syswrap-generic.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c index 6bc3756652..ee346f1b2b 100644 --- a/coregrind/m_syswrap/syswrap-generic.c +++ b/coregrind/m_syswrap/syswrap-generic.c @@ -3351,10 +3351,9 @@ PRE(sys_ioctl) PRE_MEM_WRITE( "ioctl(SG_GET_RESERVED_SIZE)", ARG3, sizeof(int) ); break; case VKI_SG_GET_TIMEOUT: - PRE_MEM_WRITE( "ioctl(SG_GET_TIMEOUT)", ARG3, sizeof(int) ); break; case VKI_SG_GET_VERSION_NUM: - PRE_MEM_READ( "ioctl(SG_GET_VERSION_NUM)", ARG3, sizeof(int) ); + PRE_MEM_WRITE( "ioctl(SG_GET_VERSION_NUM)", ARG3, sizeof(int) ); break; case VKI_SG_EMULATED_HOST: /* 0x2203 */ PRE_MEM_WRITE( "ioctl(SG_EMULATED_HOST)", ARG3, sizeof(int) ); @@ -4431,9 +4430,9 @@ POST(sys_ioctl) POST_MEM_WRITE(ARG3, sizeof(int)); break; case VKI_SG_GET_TIMEOUT: - POST_MEM_WRITE(ARG3, sizeof(int)); break; case VKI_SG_GET_VERSION_NUM: + POST_MEM_WRITE(ARG3, sizeof(int)); break; case VKI_SG_EMULATED_HOST: POST_MEM_WRITE(ARG3, sizeof(int)); -- 2.47.2