Commit 4fdea584 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull uaccess/__put-user updates from Al Viro:
 "Removal of __put_user() calls - misc patches that don't fit into any
  other series"

* 'uaccess.__put_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  pcm_native: result of put_user() needs to be checked
  scsi_ioctl.c: switch SCSI_IOCTL_GET_IDLUN to copy_to_user()
  compat sysinfo(2): don't bother with field-by-field copyout
parents e148a8f9 ebe6976d

drivers/scsi/scsi_ioctl.c

+10 −10
Original line number Diff line number Diff line
@@ -211,18 +211,18 @@ static int scsi_ioctl_common(struct scsi_device *sdev, int cmd, void __user *arg 
	}



	switch (cmd) {

	case SCSI_IOCTL_GET_IDLUN:

		if (!access_ok(arg, sizeof(struct scsi_idlun)))

			return -EFAULT;



		__put_user((sdev->id & 0xff)

	case SCSI_IOCTL_GET_IDLUN: {

		struct scsi_idlun v = {

			.dev_id = (sdev->id & 0xff)

				 + ((sdev->lun & 0xff) << 8)

				 + ((sdev->channel & 0xff) << 16)

				 + ((sdev->host->host_no & 0xff) << 24),

			 &((struct scsi_idlun __user *)arg)->dev_id);

		__put_user(sdev->host->unique_id,

			 &((struct scsi_idlun __user *)arg)->host_unique_id);

			.host_unique_id = sdev->host->unique_id

		};

		if (copy_to_user(arg, &v, sizeof(struct scsi_idlun)))

			return -EFAULT;

		return 0;

	}

	case SCSI_IOCTL_GET_BUS_NUMBER:

		return put_user(sdev->host->host_no, (int __user *)arg);

	case SCSI_IOCTL_PROBE_HOST:

kernel/sys.c

+17 −16
Original line number Diff line number Diff line
@@ -2634,6 +2634,7 @@ struct compat_sysinfo { 
COMPAT_SYSCALL_DEFINE1(sysinfo, struct compat_sysinfo __user *, info)

{

	struct sysinfo s;

	struct compat_sysinfo s_32;



	do_sysinfo(&s);
@@ -2658,23 +2659,23 @@ COMPAT_SYSCALL_DEFINE1(sysinfo, struct compat_sysinfo __user *, info) 
		s.freehigh >>= bitcount;

	}



	if (!access_ok(info, sizeof(struct compat_sysinfo)) ||

	    __put_user(s.uptime, &info->uptime) ||

	    __put_user(s.loads[0], &info->loads[0]) ||

	    __put_user(s.loads[1], &info->loads[1]) ||

	    __put_user(s.loads[2], &info->loads[2]) ||

	    __put_user(s.totalram, &info->totalram) ||

	    __put_user(s.freeram, &info->freeram) ||

	    __put_user(s.sharedram, &info->sharedram) ||

	    __put_user(s.bufferram, &info->bufferram) ||

	    __put_user(s.totalswap, &info->totalswap) ||

	    __put_user(s.freeswap, &info->freeswap) ||

	    __put_user(s.procs, &info->procs) ||

	    __put_user(s.totalhigh, &info->totalhigh) ||

	    __put_user(s.freehigh, &info->freehigh) ||

	    __put_user(s.mem_unit, &info->mem_unit))

	memset(&s_32, 0, sizeof(s_32));

	s_32.uptime = s.uptime;

	s_32.loads[0] = s.loads[0];

	s_32.loads[1] = s.loads[1];

	s_32.loads[2] = s.loads[2];

	s_32.totalram = s.totalram;

	s_32.freeram = s.freeram;

	s_32.sharedram = s.sharedram;

	s_32.bufferram = s.bufferram;

	s_32.totalswap = s.totalswap;

	s_32.freeswap = s.freeswap;

	s_32.procs = s.procs;

	s_32.totalhigh = s.totalhigh;

	s_32.freehigh = s.freehigh;

	s_32.mem_unit = s.mem_unit;

	if (copy_to_user(info, &s_32, sizeof(s_32)))

		return -EFAULT;



	return 0;

}

#endif /* CONFIG_COMPAT */

sound/core/pcm_native.c

+8 −4
Original line number Diff line number Diff line
@@ -3093,7 +3093,8 @@ static int snd_pcm_xferi_frames_ioctl(struct snd_pcm_substream *substream, 
		result = snd_pcm_lib_write(substream, xferi.buf, xferi.frames);

	else

		result = snd_pcm_lib_read(substream, xferi.buf, xferi.frames);

	__put_user(result, &_xferi->result);

	if (put_user(result, &_xferi->result))

		return -EFAULT;

	return result < 0 ? result : 0;

}
@@ -3122,7 +3123,8 @@ static int snd_pcm_xfern_frames_ioctl(struct snd_pcm_substream *substream, 
	else

		result = snd_pcm_lib_readv(substream, bufs, xfern.frames);

	kfree(bufs);

	__put_user(result, &_xfern->result);

	if (put_user(result, &_xfern->result))

		return -EFAULT;

	return result < 0 ? result : 0;

}
@@ -3137,7 +3139,8 @@ static int snd_pcm_rewind_ioctl(struct snd_pcm_substream *substream, 
	if (put_user(0, _frames))

		return -EFAULT;

	result = snd_pcm_rewind(substream, frames);

	__put_user(result, _frames);

	if (put_user(result, _frames))

		return -EFAULT;

	return result < 0 ? result : 0;

}
@@ -3152,7 +3155,8 @@ static int snd_pcm_forward_ioctl(struct snd_pcm_substream *substream, 
	if (put_user(0, _frames))

		return -EFAULT;

	result = snd_pcm_forward(substream, frames);

	__put_user(result, _frames);

	if (put_user(result, _frames))

		return -EFAULT;

	return result < 0 ? result : 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE