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

Commit 0e0965a2 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

netfilter: ipset: Fix an error code in ip_set_sockfn_get() 



commit 30b7244d79651460ff114ba8f7987ed94c86b99a upstream.

The copy_to_user() function returns the number of bytes remaining to be
copied.  In this code, that positive return is checked at the end of the
function and we return zero/success.  What we should do instead is
return -EFAULT.

Fixes: a7b4f989 ("netfilter: ipset: IP set core support")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f823bf0f

net/netfilter/ipset/ip_set_core.c

+5 −3
Original line number Diff line number Diff line
@@ -1942,8 +1942,9 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len) 
		}



		req_version->version = IPSET_PROTOCOL;

		ret = copy_to_user(user, req_version,

				   sizeof(struct ip_set_req_version));

		if (copy_to_user(user, req_version,

				 sizeof(struct ip_set_req_version)))

			ret = -EFAULT;

		goto done;

	}

	case IP_SET_OP_GET_BYNAME: {
@@ -2000,7 +2001,8 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len) 
	}	/* end of switch(op) */



copy:

	ret = copy_to_user(user, data, copylen);

	if (copy_to_user(user, data, copylen))

		ret = -EFAULT;



done:

	vfree(data);