Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0a47d32 authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by David S. Miller
Browse files

rds: Make rds_message_copy_from_user() return 0 on success. 



Commit 083735f4 ("rds: switch rds_message_copy_from_user() to iov_iter")
breaks rds_message_copy_from_user() semantics on success, and causes it
to return nbytes copied, when it should return 0.  This commit fixes that bug.

Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 11ac1199

net/rds/message.c

+4 −4
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ struct rds_message *rds_message_map_pages(unsigned long *page_addrs, unsigned in 


int rds_message_copy_from_user(struct rds_message *rm, struct iov_iter *from)

{

	unsigned long to_copy;

	unsigned long to_copy, nbytes;

	unsigned long sg_off;

	struct scatterlist *sg;

	int ret = 0;
@@ -293,9 +293,9 @@ int rds_message_copy_from_user(struct rds_message *rm, struct iov_iter *from) 
				sg->length - sg_off);



		rds_stats_add(s_copy_from_user, to_copy);

		ret = copy_page_from_iter(sg_page(sg), sg->offset + sg_off,

		nbytes = copy_page_from_iter(sg_page(sg), sg->offset + sg_off,

					     to_copy, from);

		if (ret != to_copy)

		if (nbytes != to_copy)

			return -EFAULT;



		sg_off += to_copy;