Skip to content

Commit

Permalink
netfilter: ipset: small potential read beyond the end of buffer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and Pablo Neira Ayuso committed Nov 11, 2014
1 parent 6b96686 commit 2196937
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions net/netfilter/ipset/ip_set_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1863,6 +1863,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;
Expand Down

0 comments on commit 2196937

Please sign in to comment.