Commit e0cd9206 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'uaccess.access_ok' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull uaccess/access_ok updates from Al Viro:
 "Removals of trivially pointless access_ok() calls.

  Note: the fiemap stuff was removed from the series, since they are
  duplicates with part of ext4 series carried in Ted's tree"

* 'uaccess.access_ok' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vmci_host: get rid of pointless access_ok()
  hfi1: get rid of pointless access_ok()
  usb: get rid of pointless access_ok() calls
  lpfc_debugfs: get rid of pointless access_ok()
  efi_test: get rid of pointless access_ok()
  drm_read(): get rid of pointless access_ok()
  via-pmu: don't bother with access_ok()
  drivers/crypto/ccp/sev-dev.c: get rid of pointless access_ok()
  omapfb: get rid of pointless access_ok() calls
  amifb: get rid of pointless access_ok() calls
  drivers/fpga/dfl-afu-dma-region.c: get rid of pointless access_ok()
  drivers/fpga/dfl-fme-pr.c: get rid of pointless access_ok()
  cm4000_cs.c cmm_ioctl(): get rid of pointless access_ok()
  nvram: drop useless access_ok()
  n_hdlc_tty_read(): remove pointless access_ok()
  tomoyo_write_control(): get rid of pointless access_ok()
  btrfs_ioctl_send(): don't bother with access_ok()
  fat_dir_ioctl(): hadn't needed that access_ok() for more than a decade...
  dlmfs_file_write(): get rid of pointless access_ok()
parents 4b01285e 87c233b8

drivers/char/nvram.c

+0 −4
Original line number Diff line number Diff line
@@ -232,8 +232,6 @@ static ssize_t nvram_misc_read(struct file *file, char __user *buf, 
	ssize_t ret;





	if (!access_ok(buf, count))

		return -EFAULT;

	if (*ppos >= nvram_size)

		return 0;
@@ -264,8 +262,6 @@ static ssize_t nvram_misc_write(struct file *file, const char __user *buf, 
	char *tmp;

	ssize_t ret;



	if (!access_ok(buf, count))

		return -EFAULT;

	if (*ppos >= nvram_size)

		return 0;

drivers/char/pcmcia/cm4000_cs.c

+0 −14
Original line number Diff line number Diff line
@@ -1404,7 +1404,6 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	unsigned int iobase = dev->p_dev->resource[0]->start;

	struct inode *inode = file_inode(filp);

	struct pcmcia_device *link;

	int size;

	int rc;

	void __user *argp = (void __user *)arg;

#ifdef CM4000_DEBUG
@@ -1441,19 +1440,6 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		DEBUGP(4, dev, "iocnr mismatch\n");

		goto out;

	}

	size = _IOC_SIZE(cmd);

	rc = -EFAULT;

	DEBUGP(4, dev, "iocdir=%.4x iocr=%.4x iocw=%.4x iocsize=%d cmd=%.4x\n",

	      _IOC_DIR(cmd), _IOC_READ, _IOC_WRITE, size, cmd);



	if (_IOC_DIR(cmd) & _IOC_READ) {

		if (!access_ok(argp, size))

			goto out;

	}

	if (_IOC_DIR(cmd) & _IOC_WRITE) {

		if (!access_ok(argp, size))

			goto out;

	}

	rc = 0;



	switch (cmd) {

drivers/crypto/ccp/sev-dev.c

+3 −12
Original line number Diff line number Diff line
@@ -394,8 +394,7 @@ static int sev_ioctl_do_pek_csr(struct sev_issue_cmd *argp, bool writable) 
		goto cmd;



	/* allocate a physically contiguous buffer to store the CSR blob */

	if (!access_ok(input.address, input.length) ||

	    input.length > SEV_FW_BLOB_MAX_SIZE) {

	if (input.length > SEV_FW_BLOB_MAX_SIZE) {

		ret = -EFAULT;

		goto e_free;

	}
@@ -632,12 +631,6 @@ static int sev_ioctl_do_get_id2(struct sev_issue_cmd *argp) 
	if (copy_from_user(&input, (void __user *)argp->data, sizeof(input)))

		return -EFAULT;



	/* Check if we have write access to the userspace buffer */

	if (input.address &&

	    input.length &&

	    !access_ok(input.address, input.length))

		return -EFAULT;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;
@@ -753,15 +746,13 @@ static int sev_ioctl_do_pdh_export(struct sev_issue_cmd *argp, bool writable) 
		goto cmd;



	/* Allocate a physically contiguous buffer to store the PDH blob. */

	if ((input.pdh_cert_len > SEV_FW_BLOB_MAX_SIZE) ||

	    !access_ok(input.pdh_cert_address, input.pdh_cert_len)) {

	if (input.pdh_cert_len > SEV_FW_BLOB_MAX_SIZE) {

		ret = -EFAULT;

		goto e_free;

	}



	/* Allocate a physically contiguous buffer to store the cert chain blob. */

	if ((input.cert_chain_len > SEV_FW_BLOB_MAX_SIZE) ||

	    !access_ok(input.cert_chain_address, input.cert_chain_len)) {

	if (input.cert_chain_len > SEV_FW_BLOB_MAX_SIZE) {

		ret = -EFAULT;

		goto e_free;

	}

drivers/firmware/efi/test/efi_test.c

+0 −12
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ copy_ucs2_from_user_len(efi_char16_t **dst, efi_char16_t __user *src, 
		return 0;

	}



	if (!access_ok(src, 1))

		return -EFAULT;



	buf = memdup_user(src, len);

	if (IS_ERR(buf)) {

		*dst = NULL;
@@ -91,9 +88,6 @@ copy_ucs2_from_user_len(efi_char16_t **dst, efi_char16_t __user *src, 
static inline int

get_ucs2_strsize_from_user(efi_char16_t __user *src, size_t *len)

{

	if (!access_ok(src, 1))

		return -EFAULT;



	*len = user_ucs2_strsize(src);

	if (*len == 0)

		return -EFAULT;
@@ -118,9 +112,6 @@ copy_ucs2_from_user(efi_char16_t **dst, efi_char16_t __user *src) 
{

	size_t len;



	if (!access_ok(src, 1))

		return -EFAULT;



	len = user_ucs2_strsize(src);

	if (len == 0)

		return -EFAULT;
@@ -142,9 +133,6 @@ copy_ucs2_to_user_len(efi_char16_t __user *dst, efi_char16_t *src, size_t len) 
	if (!src)

		return 0;



	if (!access_ok(dst, 1))

		return -EFAULT;



	return copy_to_user(dst, src, len);

}

drivers/fpga/dfl-afu-dma-region.c

+0 −4
Original line number Diff line number Diff line
@@ -324,10 +324,6 @@ int afu_dma_map_region(struct dfl_feature_platform_data *pdata, 
	if (user_addr + length < user_addr)

		return -EINVAL;



	if (!access_ok((void __user *)(unsigned long)user_addr,

		       length))

		return -EINVAL;



	region = kzalloc(sizeof(*region), GFP_KERNEL);

	if (!region)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE