diff --git a/valgrind-3.16.1-ficlone.patch b/valgrind-3.16.1-ficlone.patch new file mode 100644 index 0000000..83b00a3 --- /dev/null +++ b/valgrind-3.16.1-ficlone.patch @@ -0,0 +1,43 @@ +commit 1c49351424f04ee29a5efc054cb08ab3ad22b978 +Author: Laurent Bonnans +Date: Fri Nov 16 15:22:18 2018 +0100 + + Fix 397605 - Add support for Linux FICLONE ioctl + +diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c +index 41849873e..328e02a98 100644 +--- a/coregrind/m_syswrap/syswrap-linux.c ++++ b/coregrind/m_syswrap/syswrap-linux.c +@@ -7961,6 +7961,11 @@ PRE(sys_ioctl) + case VKI_FIBMAP: + PRE_MEM_READ( "ioctl(FIBMAP)", ARG3, sizeof(int)); + break; ++ case VKI_FICLONE: ++ /* The direction of FICLONE (W) is incorrectly specified ++ * as it expects a file descriptor and not a pointer to ++ * user data */ ++ break; + + case VKI_FBIOGET_VSCREENINFO: /* 0x4600 */ + PRE_MEM_WRITE( "ioctl(FBIOGET_VSCREENINFO)", ARG3, +@@ -10898,6 +10903,8 @@ POST(sys_ioctl) + case VKI_FIBMAP: + POST_MEM_WRITE(ARG3, sizeof(int)); + break; ++ case VKI_FICLONE: ++ break; + + case VKI_FBIOGET_VSCREENINFO: //0x4600 + POST_MEM_WRITE(ARG3, sizeof(struct vki_fb_var_screeninfo)); +diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h +index ef93b9258..3b9dc3779 100644 +--- a/include/vki/vki-linux.h ++++ b/include/vki/vki-linux.h +@@ -1888,6 +1888,7 @@ struct vki_ppdev_frob_struct { + + #define VKI_FIBMAP _VKI_IO(0x00,1) /* bmap access */ + #define VKI_FIGETBSZ _VKI_IO(0x00,2) /* get the block size used for bmap */ ++#define VKI_FICLONE _VKI_IOW(0x94, 9, int) + + //---------------------------------------------------------------------- + // From linux-2.6.8.1/include/scsi/sg.h diff --git a/valgrind.spec b/valgrind.spec index 33673b3..db14efe 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -130,6 +130,9 @@ Patch17: valgrind-3.16.1-stxsibx-stxsihx.patch # KDE#430485 expr_is_guardable doesn't handle Iex_Qop Patch18: valgrind-3.16.1-arm64-fma.patch +# KDE#397605 Add support for Linux FICLONE ioctl +Patch19: valgrind-3.16.1-ficlone.patch + BuildRequires: glibc-devel %if %{build_openmpi} @@ -276,6 +279,7 @@ Valgrind User Manual for details. %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %build # LTO triggers undefined symbols in valgrind. Valgrind has a --enable-lto @@ -500,6 +504,9 @@ fi %endif %changelog +* Sun Dec 20 2020 Mark Wielaard +- Add valgrind-3.16.1-ficlone.patch + * Thu Dec 17 2020 Mark Wielaard - 3.16.1-11 - Update valgrind-3.16.1-arm64-fma.patch