Commit 0da52210 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'compat-ioctl-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground 

Pull removal of most of fs/compat_ioctl.c from Arnd Bergmann:
 "As part of the cleanup of some remaining y2038 issues, I came to
  fs/compat_ioctl.c, which still has a couple of commands that need
  support for time64_t.

  In completely unrelated work, I spent time on cleaning up parts of
  this file in the past, moving things out into drivers instead.

  After Al Viro reviewed an earlier version of this series and did a lot
  more of that cleanup, I decided to try to completely eliminate the
  rest of it and move it all into drivers.

  This series incorporates some of Al's work and many patches of my own,
  but in the end stops short of actually removing the last part, which
  is the scsi ioctl handlers. I have patches for those as well, but they
  need more testing or possibly a rewrite"

* tag 'compat-ioctl-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground: (42 commits)
  scsi: sd: enable compat ioctls for sed-opal
  pktcdvd: add compat_ioctl handler
  compat_ioctl: move SG_GET_REQUEST_TABLE handling
  compat_ioctl: ppp: move simple commands into ppp_generic.c
  compat_ioctl: handle PPPIOCGIDLE for 64-bit time_t
  compat_ioctl: move PPPIOCSCOMPRESS to ppp_generic
  compat_ioctl: unify copy-in of ppp filters
  tty: handle compat PPP ioctls
  compat_ioctl: move SIOCOUTQ out of compat_ioctl.c
  compat_ioctl: handle SIOCOUTQNSD
  af_unix: add compat_ioctl support
  compat_ioctl: reimplement SG_IO handling
  compat_ioctl: move WDIOC handling into wdt drivers
  fs: compat_ioctl: move FITRIM emulation into file systems
  gfs2: add compat_ioctl support
  compat_ioctl: remove unused convert_in_user macro
  compat_ioctl: remove last RAID handling code
  compat_ioctl: remove /dev/raw ioctl translation
  compat_ioctl: remove PCI ioctl translation
  compat_ioctl: remove joystick ioctl translation
  ...
parents ad0b314e 142b2ac8

Documentation/networking/ppp_generic.txt

+2 −0
Original line number Diff line number Diff line
@@ -378,6 +378,8 @@ an interface unit are: 
  CONFIG_PPP_FILTER option is enabled, the set of packets which reset

  the transmit and receive idle timers is restricted to those which

  pass the `active' packet filter.

  Two versions of this command exist, to deal with user space

  expecting times as either 32-bit or 64-bit time_t seconds.



* PPPIOCSMAXCID sets the maximum connection-ID parameter (and thus the

  number of connection slots) for the TCP header compressor and

arch/powerpc/platforms/52xx/mpc52xx_gpt.c

+1 −0
Original line number Diff line number Diff line
@@ -650,6 +650,7 @@ static const struct file_operations mpc52xx_wdt_fops = { 
	.llseek		= no_llseek,

	.write		= mpc52xx_wdt_write,

	.unlocked_ioctl = mpc52xx_wdt_ioctl,

	.compat_ioctl	= compat_ptr_ioctl,

	.open		= mpc52xx_wdt_open,

	.release	= mpc52xx_wdt_release,

};

arch/um/drivers/harddog_kern.c

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ static const struct file_operations harddog_fops = { 
	.owner		= THIS_MODULE,

	.write		= harddog_write,

	.unlocked_ioctl	= harddog_ioctl,

	.compat_ioctl	= compat_ptr_ioctl,

	.open		= harddog_open,

	.release	= harddog_release,

	.llseek		= no_llseek,

arch/um/drivers/hostaudio_kern.c

+1 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ static const struct file_operations hostaudio_fops = { 
	.write          = hostaudio_write,

	.poll           = hostaudio_poll,

	.unlocked_ioctl	= hostaudio_ioctl,

	.compat_ioctl	= compat_ptr_ioctl,

	.mmap           = NULL,

	.open           = hostaudio_open,

	.release        = hostaudio_release,

block/scsi_ioctl.c

+128 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/*

 * Copyright (C) 2001 Jens Axboe <axboe@suse.de>

 */

#include <linux/compat.h>

#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/string.h>
@@ -327,6 +328,13 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 
		struct iov_iter i;

		struct iovec *iov = NULL;



#ifdef CONFIG_COMPAT

		if (in_compat_syscall())

			ret = compat_import_iovec(rq_data_dir(rq),

				   hdr->dxferp, hdr->iovec_count,

				   0, &iov, &i);

		else

#endif

			ret = import_iovec(rq_data_dir(rq),

				   hdr->dxferp, hdr->iovec_count,

				   0, &iov, &i);
@@ -542,6 +550,122 @@ static inline int blk_send_start_stop(struct request_queue *q, 
	return __blk_send_generic(q, bd_disk, GPCMD_START_STOP_UNIT, data);

}



#ifdef CONFIG_COMPAT

struct compat_sg_io_hdr {

	compat_int_t interface_id;	/* [i] 'S' for SCSI generic (required) */

	compat_int_t dxfer_direction;	/* [i] data transfer direction  */

	unsigned char cmd_len;		/* [i] SCSI command length ( <= 16 bytes) */

	unsigned char mx_sb_len;	/* [i] max length to write to sbp */

	unsigned short iovec_count;	/* [i] 0 implies no scatter gather */

	compat_uint_t dxfer_len;	/* [i] byte count of data transfer */

	compat_uint_t dxferp;		/* [i], [*io] points to data transfer memory

						or scatter gather list */

	compat_uptr_t cmdp;		/* [i], [*i] points to command to perform */

	compat_uptr_t sbp;		/* [i], [*o] points to sense_buffer memory */

	compat_uint_t timeout;		/* [i] MAX_UINT->no timeout (unit: millisec) */

	compat_uint_t flags;		/* [i] 0 -> default, see SG_FLAG... */

	compat_int_t pack_id;		/* [i->o] unused internally (normally) */

	compat_uptr_t usr_ptr;		/* [i->o] unused internally */

	unsigned char status;		/* [o] scsi status */

	unsigned char masked_status;	/* [o] shifted, masked scsi status */

	unsigned char msg_status;	/* [o] messaging level data (optional) */

	unsigned char sb_len_wr;	/* [o] byte count actually written to sbp */

	unsigned short host_status;	/* [o] errors from host adapter */

	unsigned short driver_status;	/* [o] errors from software driver */

	compat_int_t resid;		/* [o] dxfer_len - actual_transferred */

	compat_uint_t duration;		/* [o] time taken by cmd (unit: millisec) */

	compat_uint_t info;		/* [o] auxiliary information */

};

#endif



int put_sg_io_hdr(const struct sg_io_hdr *hdr, void __user *argp)

{

#ifdef CONFIG_COMPAT

	if (in_compat_syscall()) {

		struct compat_sg_io_hdr hdr32 =  {

			.interface_id	 = hdr->interface_id,

			.dxfer_direction = hdr->dxfer_direction,

			.cmd_len	 = hdr->cmd_len,

			.mx_sb_len	 = hdr->mx_sb_len,

			.iovec_count	 = hdr->iovec_count,

			.dxfer_len	 = hdr->dxfer_len,

			.dxferp		 = (uintptr_t)hdr->dxferp,

			.cmdp		 = (uintptr_t)hdr->cmdp,

			.sbp		 = (uintptr_t)hdr->sbp,

			.timeout	 = hdr->timeout,

			.flags		 = hdr->flags,

			.pack_id	 = hdr->pack_id,

			.usr_ptr	 = (uintptr_t)hdr->usr_ptr,

			.status		 = hdr->status,

			.masked_status	 = hdr->masked_status,

			.msg_status	 = hdr->msg_status,

			.sb_len_wr	 = hdr->sb_len_wr,

			.host_status	 = hdr->host_status,

			.driver_status	 = hdr->driver_status,

			.resid		 = hdr->resid,

			.duration	 = hdr->duration,

			.info		 = hdr->info,

		};



		if (copy_to_user(argp, &hdr32, sizeof(hdr32)))

			return -EFAULT;



		return 0;

	}

#endif



	if (copy_to_user(argp, hdr, sizeof(*hdr)))

		return -EFAULT;



	return 0;

}

EXPORT_SYMBOL(put_sg_io_hdr);



int get_sg_io_hdr(struct sg_io_hdr *hdr, const void __user *argp)

{

#ifdef CONFIG_COMPAT

	struct compat_sg_io_hdr hdr32;



	if (in_compat_syscall()) {

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

			return -EFAULT;



		*hdr = (struct sg_io_hdr) {

			.interface_id	 = hdr32.interface_id,

			.dxfer_direction = hdr32.dxfer_direction,

			.cmd_len	 = hdr32.cmd_len,

			.mx_sb_len	 = hdr32.mx_sb_len,

			.iovec_count	 = hdr32.iovec_count,

			.dxfer_len	 = hdr32.dxfer_len,

			.dxferp		 = compat_ptr(hdr32.dxferp),

			.cmdp		 = compat_ptr(hdr32.cmdp),

			.sbp		 = compat_ptr(hdr32.sbp),

			.timeout	 = hdr32.timeout,

			.flags		 = hdr32.flags,

			.pack_id	 = hdr32.pack_id,

			.usr_ptr	 = compat_ptr(hdr32.usr_ptr),

			.status		 = hdr32.status,

			.masked_status	 = hdr32.masked_status,

			.msg_status	 = hdr32.msg_status,

			.sb_len_wr	 = hdr32.sb_len_wr,

			.host_status	 = hdr32.host_status,

			.driver_status	 = hdr32.driver_status,

			.resid		 = hdr32.resid,

			.duration	 = hdr32.duration,

			.info		 = hdr32.info,

		};



		return 0;

	}

#endif



	if (copy_from_user(hdr, argp, sizeof(*hdr)))

		return -EFAULT;



	return 0;

}

EXPORT_SYMBOL(get_sg_io_hdr);



int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mode,

		   unsigned int cmd, void __user *arg)

{
@@ -581,14 +705,14 @@ int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mod 
		case SG_IO: {

			struct sg_io_hdr hdr;



			err = -EFAULT;

			if (copy_from_user(&hdr, arg, sizeof(hdr)))

			err = get_sg_io_hdr(&hdr, arg);

			if (err)

				break;

			err = sg_io(q, bd_disk, &hdr, mode);

			if (err == -EFAULT)

				break;



			if (copy_to_user(arg, &hdr, sizeof(hdr)))

			if (put_sg_io_hdr(&hdr, arg))

				err = -EFAULT;

			break;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE