From: Dan Carpenter <dan.carpenter@oracle.com>
To: Pablo Neira Ayuso <pablo@netfilter.org>,
Jozsef Kadlecsik <kadlec@netfilter.org>
Cc: Florian Westphal <fw@strlen.de>,
Florent Fourcot <florent.fourcot@wifirst.fr>,
Kate Stewart <kstewart@linuxfoundation.org>,
Allison Randal <allison@lohutok.net>,
Aditya Pakki <pakki001@umn.edu>, Qian Cai <cai@gmx.us>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
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: [PATCH] netfilter: ipset: Fix an error code in ip_set_sockfn_get()
Date: Wed, 21 Aug 2019 10:18:30 +0300 [thread overview]
Message-ID: <20190821071830.GI26957@mwanda> (raw)
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>
---
net/netfilter/ipset/ip_set_core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index e64d5f9a89dd..15b8d4318207 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -2129,7 +2129,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.20.1
next reply other threads:[~2019-08-21 7:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 7:18 Dan Carpenter [this message]
2019-08-22 9:11 ` [PATCH] netfilter: ipset: Fix an error code in ip_set_sockfn_get() 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
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=20190821071830.GI26957@mwanda \
--to=dan.carpenter@oracle.com \
--cc=allison@lohutok.net \
--cc=aryabinin@virtuozzo.com \
--cc=cai@gmx.us \
--cc=coreteam@netfilter.org \
--cc=florent.fourcot@wifirst.fr \
--cc=fw@strlen.de \
--cc=johannes.berg@intel.com \
--cc=kadlec@netfilter.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=kstewart@linuxfoundation.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=pakki001@umn.edu \
--cc=sbrivio@redhat.com \
/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).