Skip to content

Commit

Permalink
netfilter: xt_u32: validate user space input
Browse files Browse the repository at this point in the history
The xt_u32 module doesn't validate the fields in the xt_u32 structure.
An attacker may take advantage of this to trigger an OOB read by setting
the size fields with a value beyond the arrays boundaries.

Add a checkentry function to validate the structure.

This was originally reported by the ZDI project (ZDI-CAN-18408).

Fixes: 1b50b8a ("[NETFILTER]: Add u32 match")
Cc: stable@vger.kernel.org
Signed-off-by: Wander Lairson Costa <wander@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
walac authored and ummakynes committed Aug 30, 2023
1 parent e994764 commit 69c5d28
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions net/netfilter/xt_u32.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,32 @@ static bool u32_mt(const struct sk_buff *skb, struct xt_action_param *par)
return ret ^ data->invert;
}

static int u32_mt_checkentry(const struct xt_mtchk_param *par)
{
const struct xt_u32 *data = par->matchinfo;
const struct xt_u32_test *ct;
unsigned int i;

if (data->ntests > ARRAY_SIZE(data->tests))
return -EINVAL;

for (i = 0; i < data->ntests; ++i) {
ct = &data->tests[i];

if (ct->nnums > ARRAY_SIZE(ct->location) ||
ct->nvalues > ARRAY_SIZE(ct->value))
return -EINVAL;
}

return 0;
}

static struct xt_match xt_u32_mt_reg __read_mostly = {
.name = "u32",
.revision = 0,
.family = NFPROTO_UNSPEC,
.match = u32_mt,
.checkentry = u32_mt_checkentry,
.matchsize = sizeof(struct xt_u32),
.me = THIS_MODULE,
};
Expand Down

0 comments on commit 69c5d28

Please sign in to comment.