Commit fe01111d authored by Liping Zhang's avatar Liping Zhang Committed by Pablo Neira Ayuso

netfilter: nft_queue: check the validation of queues_total and queuenum

Although the validation of queues_total and queuenum is checked in nft
utility, but user can add nft rules via nfnetlink, so it is necessary
to check the validation at the nft_queue expr init routine too.

Tested by run ./nft-test.py any/queue.t:
  any/queue.t: 6 unit tests, 0 error, 0 warning
Signed-off-by: default avatarLiping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1bcabc81
...@@ -65,6 +65,7 @@ static int nft_queue_init(const struct nft_ctx *ctx, ...@@ -65,6 +65,7 @@ static int nft_queue_init(const struct nft_ctx *ctx,
const struct nlattr * const tb[]) const struct nlattr * const tb[])
{ {
struct nft_queue *priv = nft_expr_priv(expr); struct nft_queue *priv = nft_expr_priv(expr);
u32 maxid;
if (tb[NFTA_QUEUE_NUM] == NULL) if (tb[NFTA_QUEUE_NUM] == NULL)
return -EINVAL; return -EINVAL;
...@@ -74,6 +75,16 @@ static int nft_queue_init(const struct nft_ctx *ctx, ...@@ -74,6 +75,16 @@ static int nft_queue_init(const struct nft_ctx *ctx,
if (tb[NFTA_QUEUE_TOTAL] != NULL) if (tb[NFTA_QUEUE_TOTAL] != NULL)
priv->queues_total = ntohs(nla_get_be16(tb[NFTA_QUEUE_TOTAL])); priv->queues_total = ntohs(nla_get_be16(tb[NFTA_QUEUE_TOTAL]));
else
priv->queues_total = 1;
if (priv->queues_total == 0)
return -EINVAL;
maxid = priv->queues_total - 1 + priv->queuenum;
if (maxid > U16_MAX)
return -ERANGE;
if (tb[NFTA_QUEUE_FLAGS] != NULL) { if (tb[NFTA_QUEUE_FLAGS] != NULL) {
priv->flags = ntohs(nla_get_be16(tb[NFTA_QUEUE_FLAGS])); priv->flags = ntohs(nla_get_be16(tb[NFTA_QUEUE_FLAGS]));
if (priv->flags & ~NFT_QUEUE_FLAG_MASK) if (priv->flags & ~NFT_QUEUE_FLAG_MASK)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment