Commit 88753cc1 authored by Phil Elwell's avatar Phil Elwell Committed by Greg Kroah-Hartman
Browse files

staging: vchiq: Fix bulk transfers on 64-bit builds 



The recent change to the bulk transfer compat function missed the fact
the relevant ioctl command is VCHIQ_IOC_QUEUE_BULK_TRANSMIT32, not
VCHIQ_IOC_QUEUE_BULK_TRANSMIT, as any attempt to send a bulk block
to the VPU would have shown.

Fixes: a4367cd2 ("staging: vchiq: convert compat bulk transfer")
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarPhil Elwell <phil@raspberrypi.com>
Link: https://lore.kernel.org/r/20210105162030.1415213-3-phil@raspberrypi.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96ae3276

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+1 −1
Original line number Diff line number Diff line
@@ -1710,7 +1710,7 @@ vchiq_compat_ioctl_queue_bulk(struct file *file, 
{

	struct vchiq_queue_bulk_transfer32 args32;

	struct vchiq_queue_bulk_transfer args;

	enum vchiq_bulk_dir dir = (cmd == VCHIQ_IOC_QUEUE_BULK_TRANSMIT) ?

	enum vchiq_bulk_dir dir = (cmd == VCHIQ_IOC_QUEUE_BULK_TRANSMIT32) ?

				  VCHIQ_BULK_TRANSMIT : VCHIQ_BULK_RECEIVE;



	if (copy_from_user(&args32, argp, sizeof(args32)))