diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-11-10 17:11:21 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-27 07:52:33 -0800 |
| commit | fcdba992c29bd54f94a90d531d6d48a45ef23b9f (patch) | |
| tree | fecb9f065ac91c90ffdc7498c281821e77a8183d | |
| parent | 34a322c73ac589947e5daf84375da23e1babd657 (diff) | |
| download | lwn-fcdba992c29bd54f94a90d531d6d48a45ef23b9f.tar.gz lwn-fcdba992c29bd54f94a90d531d6d48a45ef23b9f.zip | |
netfilter: ipset: small potential read beyond the end of buffer
commit 2196937e12b1b4ba139806d132647e1651d655df upstream.
We could be reading 8 bytes into a 4 byte buffer here. It seems
harmless but adding a check is the right thing to do and it silences a
static checker warning.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/netfilter/ipset/ip_set_core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index f77139007983..3b04dfd34554 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -1754,6 +1754,12 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len) if (*op < IP_SET_OP_VERSION) { /* Check the version at the beginning of operations */ struct ip_set_req_version *req_version = data; + + if (*len < sizeof(struct ip_set_req_version)) { + ret = -EINVAL; + goto done; + } + if (req_version->version != IPSET_PROTOCOL) { ret = -EPROTO; goto done; |