Commit f483039c authored by Dan Carpenter's avatar Dan Carpenter Committed by Kalle Valo
Browse files

rt2x00: use simple_read_from_buffer() 



The problem with this copy_to_user() calls is that they don't ensure
that "size" is less than the "length" which the user provided.

Obviously, this is debugfs and "size" is normally going to be very small
so it probably doesn't matter, but this is the correct thing to do.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 33a164fa

drivers/net/wireless/ralink/rt2x00/rt2x00debug.c

+3 −15
Original line number Diff line number Diff line
@@ -464,11 +464,7 @@ static ssize_t rt2x00debug_read_##__name(struct file *file, \ 
								\

	size = sprintf(line, __format, value);			\

								\

	if (copy_to_user(buf, line, size))			\

		return -EFAULT;					\

								\

	*offset += size;					\

	return size;						\

	return simple_read_from_buffer(buf, length, offset, line, size); \

}



#define RT2X00DEBUGFS_OPS_WRITE(__name, __type)			\
@@ -545,11 +541,7 @@ static ssize_t rt2x00debug_read_dev_flags(struct file *file, 


	size = sprintf(line, "0x%.8x\n", (unsigned int)intf->rt2x00dev->flags);



	if (copy_to_user(buf, line, size))

		return -EFAULT;



	*offset += size;

	return size;

	return simple_read_from_buffer(buf, length, offset, line, size);

}



static const struct file_operations rt2x00debug_fop_dev_flags = {
@@ -574,11 +566,7 @@ static ssize_t rt2x00debug_read_cap_flags(struct file *file, 


	size = sprintf(line, "0x%.8x\n", (unsigned int)intf->rt2x00dev->cap_flags);



	if (copy_to_user(buf, line, size))

		return -EFAULT;



	*offset += size;

	return size;

	return simple_read_from_buffer(buf, length, offset, line, size);

}



static const struct file_operations rt2x00debug_fop_cap_flags = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE