| Message ID | 20190824144955.GA5337@mwanda |
|---|---|
| State | Accepted |
| Delegated to: | Jozsef Kadlecsik |
| Headers | show |
| Series | [v2] netfilter: ipset: Fix an error code in ip_set_sockfn_get() | expand |
Hi Dan, On Sat, 24 Aug 2019, Dan Carpenter wrote: > 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: a7b4f989a629 ("netfilter: ipset: IP set core support") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > v2: I missed the other instance of this issue > > net/netfilter/ipset/ip_set_core.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) Patch is applied in the ipset git tree, thanks! Best regards, Jozsef > diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c > index e64d5f9a89dd..e7288eab7512 100644 > --- a/net/netfilter/ipset/ip_set_core.c > +++ b/net/netfilter/ipset/ip_set_core.c > @@ -2069,8 +2069,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: { > @@ -2129,7 +2130,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); > -- > 2.11.0 > > - E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences H-1525 Budapest 114, POB. 49, Hungary
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index e64d5f9a89dd..e7288eab7512 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -2069,8 +2069,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: { @@ -2129,7 +2130,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);
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: a7b4f989a629 ("netfilter: ipset: IP set core support") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- v2: I missed the other instance of this issue net/netfilter/ipset/ip_set_core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)