From: "Kadlecsik József" <kadlec@blackhole.kfki.hu>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>,
Jozsef Kadlecsik <kadlec@netfilter.org>,
Florian Westphal <fw@strlen.de>,
Florent Fourcot <florent.fourcot@wifirst.fr>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
Aditya Pakki <pakki001@umn.edu>,
Johannes Berg <johannes.berg@intel.com>,
Stefano Brivio <sbrivio@redhat.com>,
netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v2] netfilter: ipset: Fix an error code in ip_set_sockfn_get()
Date: Tue, 27 Aug 2019 20:21:29 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1908272020470.11996@blackhole.kfki.hu> (raw)
In-Reply-To: <20190824144955.GA5337@mwanda>
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
prev parent reply other threads:[~2019-08-27 18:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 7:18 [PATCH] netfilter: ipset: Fix an error code in ip_set_sockfn_get() Dan Carpenter
2019-08-22 9:11 ` Kadlecsik József
2019-08-22 9:41 ` Dan Carpenter
2019-08-24 14:49 ` [PATCH v2] " Dan Carpenter
2019-08-27 18:21 ` Kadlecsik József [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1908272020470.11996@blackhole.kfki.hu \
--to=kadlec@blackhole.kfki.hu \
--cc=aryabinin@virtuozzo.com \
--cc=coreteam@netfilter.org \
--cc=dan.carpenter@oracle.com \
--cc=florent.fourcot@wifirst.fr \
--cc=fw@strlen.de \
--cc=gregkh@linuxfoundation.org \
--cc=johannes.berg@intel.com \
--cc=kadlec@netfilter.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=pakki001@umn.edu \
--cc=sbrivio@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).