| Message ID | 1507822245-15748-2-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | fix incorrect target ioctl numbers | expand |
Le 12/10/2017 à 17:30, Peter Maydell a écrit : > We were defining TARGET_FS_IOC_GETFLAGS and TARGET_FS_IOC_SETFLAGS > using the host 'long' type in the size field, which meant that > they had the wrong values if the host and guest had different > sized longs. Switch to abi_long instead. > > This fixes a bug where these ioctls don't work on 32-bit guests > on 64-bit hosts (and makes the LTP test 'setxattr03' pass > where it did not previously.) > > Reported-by: pgndev <pgnet.dev@gmail.com> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > linux-user/syscall_defs.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h > index 40c5027..f7cc9f9 100644 > --- a/linux-user/syscall_defs.h > +++ b/linux-user/syscall_defs.h > @@ -1101,8 +1101,8 @@ struct target_pollfd { > /* Note that the ioctl numbers claim type "long" but the actual type > * used by the kernel is "int". > */ > -#define TARGET_FS_IOC_GETFLAGS TARGET_IOR('f', 1, long) > -#define TARGET_FS_IOC_SETFLAGS TARGET_IOW('f', 2, long) > +#define TARGET_FS_IOC_GETFLAGS TARGET_IOR('f', 1, abi_long) > +#define TARGET_FS_IOC_SETFLAGS TARGET_IOW('f', 2, abi_long) > > #define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap) > > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
On Thu, Oct 12, 2017 at 04:30:44PM +0100, Peter Maydell wrote: > We were defining TARGET_FS_IOC_GETFLAGS and TARGET_FS_IOC_SETFLAGS > using the host 'long' type in the size field, which meant that > they had the wrong values if the host and guest had different > sized longs. Switch to abi_long instead. > > This fixes a bug where these ioctls don't work on 32-bit guests > on 64-bit hosts (and makes the LTP test 'setxattr03' pass > where it did not previously.) Applied to linux-user, thanks > Reported-by: pgndev <pgnet.dev@gmail.com> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > linux-user/syscall_defs.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h > index 40c5027..f7cc9f9 100644 > --- a/linux-user/syscall_defs.h > +++ b/linux-user/syscall_defs.h > @@ -1101,8 +1101,8 @@ struct target_pollfd { > /* Note that the ioctl numbers claim type "long" but the actual type > * used by the kernel is "int". > */ > -#define TARGET_FS_IOC_GETFLAGS TARGET_IOR('f', 1, long) > -#define TARGET_FS_IOC_SETFLAGS TARGET_IOW('f', 2, long) > +#define TARGET_FS_IOC_GETFLAGS TARGET_IOR('f', 1, abi_long) > +#define TARGET_FS_IOC_SETFLAGS TARGET_IOW('f', 2, abi_long) > > #define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap) > > -- > 2.7.4 >
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 40c5027..f7cc9f9 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -1101,8 +1101,8 @@ struct target_pollfd { /* Note that the ioctl numbers claim type "long" but the actual type * used by the kernel is "int". */ -#define TARGET_FS_IOC_GETFLAGS TARGET_IOR('f', 1, long) -#define TARGET_FS_IOC_SETFLAGS TARGET_IOW('f', 2, long) +#define TARGET_FS_IOC_GETFLAGS TARGET_IOR('f', 1, abi_long) +#define TARGET_FS_IOC_SETFLAGS TARGET_IOW('f', 2, abi_long) #define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap)
We were defining TARGET_FS_IOC_GETFLAGS and TARGET_FS_IOC_SETFLAGS using the host 'long' type in the size field, which meant that they had the wrong values if the host and guest had different sized longs. Switch to abi_long instead. This fixes a bug where these ioctls don't work on 32-bit guests on 64-bit hosts (and makes the LTP test 'setxattr03' pass where it did not previously.) Reported-by: pgndev <pgnet.dev@gmail.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- linux-user/syscall_defs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)