Commit 3bad2f1c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.misc-set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc user access cleanups from Al Viro:
 "The first pile is assorted getting rid of cargo-culted access_ok(),
  cargo-culted set_fs() and field-by-field copyouts.

  The same description applies to a lot of stuff in other branches -
  this is just the stuff that didn't fit into a more specific topical
  branch"

* 'work.misc-set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  Switch flock copyin/copyout primitives to copy_{from,to}_user()
  fs/fcntl: return -ESRCH in f_setown when pid/pgid can't be found
  fs/fcntl: f_setown, avoid undefined behaviour
  fs/fcntl: f_setown, allow returning error
  lpfc debugfs: get rid of pointless access_ok()
  adb: get rid of pointless access_ok()
  isdn: get rid of pointless access_ok()
  compat statfs: switch to copy_to_user()
  fs/locks: don't mess with the address limit in compat_fcntl64
  nfsd_readlink(): switch to vfs_get_link()
  drbd: ->sendpage() never needed set_fs()
  fs/locks: pass kernel struct flock to fcntl_getlk/setlk
  fs: locks: Fix some troubles at kernel-doc comments
parents b4b8cbf6 8c6657cb

drivers/block/drbd/drbd_main.c

+0 −3
Original line number Diff line number Diff line
@@ -1551,7 +1551,6 @@ static int _drbd_send_page(struct drbd_peer_device *peer_device, struct page *pa 
		    int offset, size_t size, unsigned msg_flags)

{

	struct socket *socket = peer_device->connection->data.socket;

	mm_segment_t oldfs = get_fs();

	int len = size;

	int err = -EIO;
@@ -1566,7 +1565,6 @@ static int _drbd_send_page(struct drbd_peer_device *peer_device, struct page *pa 


	msg_flags |= MSG_NOSIGNAL;

	drbd_update_congested(peer_device->connection);

	set_fs(KERNEL_DS);

	do {

		int sent;
@@ -1586,7 +1584,6 @@ static int _drbd_send_page(struct drbd_peer_device *peer_device, struct page *pa 
		len    -= sent;

		offset += sent;

	} while (len > 0 /* THINK && device->cstate >= C_CONNECTED*/);

	set_fs(oldfs);

	clear_bit(NET_CONGESTED, &peer_device->connection->flags);



	if (len == 0) {

drivers/isdn/i4l/isdn_common.c

+0 −18
Original line number Diff line number Diff line
@@ -1304,9 +1304,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) 
			if (arg) {

				ulong __user *p = argp;

				int i;

				if (!access_ok(VERIFY_WRITE, p,

					       sizeof(ulong) * ISDN_MAX_CHANNELS * 2))

					return -EFAULT;

				for (i = 0; i < ISDN_MAX_CHANNELS; i++) {

					put_user(dev->ibytes[i], p++);

					put_user(dev->obytes[i], p++);
@@ -1540,11 +1537,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) 
				char __user *p = argp;

				int i;



				if (!access_ok(VERIFY_WRITE, argp,

					       (ISDN_MODEM_NUMREG + ISDN_MSNLEN + ISDN_LMSNLEN)

					       * ISDN_MAX_CHANNELS))

					return -EFAULT;



				for (i = 0; i < ISDN_MAX_CHANNELS; i++) {

					if (copy_to_user(p, dev->mdm.info[i].emu.profile,

							 ISDN_MODEM_NUMREG))
@@ -1567,11 +1559,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) 
				char __user *p = argp;

				int i;



				if (!access_ok(VERIFY_READ, argp,

					       (ISDN_MODEM_NUMREG + ISDN_MSNLEN + ISDN_LMSNLEN)

					       * ISDN_MAX_CHANNELS))

					return -EFAULT;



				for (i = 0; i < ISDN_MAX_CHANNELS; i++) {

					if (copy_from_user(dev->mdm.info[i].emu.profile, p,

							   ISDN_MODEM_NUMREG))
@@ -1617,8 +1604,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) 
						int j = 0;



						while (1) {

							if (!access_ok(VERIFY_READ, p, 1))

								return -EFAULT;

							get_user(bname[j], p++);

							switch (bname[j]) {

							case '\0':
@@ -1685,9 +1670,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) 
					drvidx = 0;

				if (drvidx == -1)

					return -ENODEV;

				if (!access_ok(VERIFY_WRITE, argp,

					       sizeof(isdn_ioctl_struct)))

					return -EFAULT;

				c.driver = drvidx;

				c.command = ISDN_CMD_IOCTL;

				c.arg = cmd;

drivers/isdn/i4l/isdn_ppp.c

+0 −6
Original line number Diff line number Diff line
@@ -795,9 +795,6 @@ isdn_ppp_read(int min, struct file *file, char __user *buf, int count) 
	if (!(is->state & IPPP_OPEN))

		return 0;



	if (!access_ok(VERIFY_WRITE, buf, count))

		return -EFAULT;



	spin_lock_irqsave(&is->buflock, flags);

	b = is->first->next;

	save_buf = b->buf;
@@ -2014,9 +2011,6 @@ isdn_ppp_dev_ioctl_stats(int slot, struct ifreq *ifr, struct net_device *dev) 
	struct ppp_stats t;

	isdn_net_local *lp = netdev_priv(dev);



	if (!access_ok(VERIFY_WRITE, res, sizeof(struct ppp_stats)))

		return -EFAULT;



	/* build a temporary stat struct and copy it to user space */



	memset(&t, 0, sizeof(struct ppp_stats));

drivers/isdn/isdnloop/isdnloop.c

+0 −2
Original line number Diff line number Diff line
@@ -1142,8 +1142,6 @@ isdnloop_command(isdn_ctrl *c, isdnloop_card *card) 
		case ISDNLOOP_IOCTL_DEBUGVAR:

			return (ulong) card;

		case ISDNLOOP_IOCTL_STARTUP:

			if (!access_ok(VERIFY_READ, (void *) a, sizeof(isdnloop_sdef)))

				return -EFAULT;

			return isdnloop_start(card, (isdnloop_sdef *) a);

			break;

		case ISDNLOOP_IOCTL_ADDCARD:

drivers/macintosh/adb.c

+0 −4
Original line number Diff line number Diff line
@@ -723,8 +723,6 @@ static ssize_t adb_read(struct file *file, char __user *buf, 
		return -EINVAL;

	if (count > sizeof(req->reply))

		count = sizeof(req->reply);

	if (!access_ok(VERIFY_WRITE, buf, count))

		return -EFAULT;



	req = NULL;

	spin_lock_irqsave(&state->lock, flags);
@@ -781,8 +779,6 @@ static ssize_t adb_write(struct file *file, const char __user *buf, 
		return -EINVAL;

	if (adb_controller == NULL)

		return -ENXIO;

	if (!access_ok(VERIFY_READ, buf, count))

		return -EFAULT;



	req = kmalloc(sizeof(struct adb_request),

					     GFP_KERNEL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE