From: Petar Jovanovic Date: Wed, 27 Sep 2017 14:04:31 +0000 (+0200) Subject: mips: fix VKI_SIOCATMARK, VKI_SIOCSPGRP and VKI_SIOCGPGRP macros X-Git-Tag: VALGRIND_3_14_0~248 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c96148a2a1b2a82e4ed5a9e9287f84052ae6502a;p=thirdparty%2Fvalgrind.git mips: fix VKI_SIOCATMARK, VKI_SIOCSPGRP and VKI_SIOCGPGRP macros Set correct values from Linux kernel. See ./arch/mips/include/uapi/asm/sockios.h This issue is covered by newly introduced memcheck test mips32/bad_sioc. --- diff --git a/include/vki/vki-mips32-linux.h b/include/vki/vki-mips32-linux.h index 7aba355821..d3fb1d9dd2 100644 --- a/include/vki/vki-mips32-linux.h +++ b/include/vki/vki-mips32-linux.h @@ -384,9 +384,9 @@ struct vki_f_owner_ex { // From linux-2.6.35.5/include/asm-i386/sockios.h //---------------------------------------------------------------------- -#define VKI_SIOCSPGRP 0x8902 -#define VKI_SIOCGPGRP 0x8904 -#define VKI_SIOCATMARK 0x8905 +#define VKI_SIOCATMARK _VKI_IOR('s', 7, int) +#define VKI_SIOCSPGRP _VKI_IOW('s', 8, vki_pid_t) +#define VKI_SIOCGPGRP _VKI_IOR('s', 9, vki_pid_t) #define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ #define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ diff --git a/include/vki/vki-mips64-linux.h b/include/vki/vki-mips64-linux.h index c20c2980a7..814e5233b0 100644 --- a/include/vki/vki-mips64-linux.h +++ b/include/vki/vki-mips64-linux.h @@ -389,9 +389,9 @@ struct vki_f_owner_ex { // From linux-2.6.35.9/include/asm-i386/sockios.h //---------------------------------------------------------------------- -#define VKI_SIOCSPGRP 0x8902 -#define VKI_SIOCGPGRP 0x8904 -#define VKI_SIOCATMARK 0x8905 +#define VKI_SIOCATMARK _VKI_IOR('s', 7, int) +#define VKI_SIOCSPGRP _VKI_IOW('s', 8, vki_pid_t) +#define VKI_SIOCGPGRP _VKI_IOR('s', 9, vki_pid_t) #define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ #define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */