Commit a62726cb authored by Al Viro's avatar Al Viro Committed by Martin K. Petersen
Browse files

scsi: sg: sg_new_write(): replace access_ok() + __copy_from_user() with copy_from_user() 

Link: https://lore.kernel.org/r/20191017193925.25539-2-viro@ZenIV.linux.org.uk


Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a16a4741

drivers/scsi/sg.c

+1 −5
Original line number Diff line number Diff line
@@ -763,11 +763,7 @@ sg_new_write(Sg_fd *sfp, struct file *file, const char __user *buf, 
		sg_remove_request(sfp, srp);

		return -EMSGSIZE;

	}

	if (!access_ok(hp->cmdp, hp->cmd_len)) {

		sg_remove_request(sfp, srp);

		return -EFAULT;	/* protects following copy_from_user()s + get_user()s */

	}

	if (__copy_from_user(cmnd, hp->cmdp, hp->cmd_len)) {

	if (copy_from_user(cmnd, hp->cmdp, hp->cmd_len)) {

		sg_remove_request(sfp, srp);

		return -EFAULT;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE