rxrpc: Accesses of rxrpc_local::service need to be RCU managed

[cascardo/linux.git] / net / netfilter / nft_queue.c

diff --git a/net/netfilter/nft_queue.c b/net/netfilter/nft_queue.c
index 61d216e..393d359 100644 (file)
--- a/net/netfilter/nft_queue.c
+++ b/net/netfilter/nft_queue.c
@@ -22,9 +22,10 @@
 static u32 jhash_initval __read_mostly;
 
 struct nft_queue {
-       u16     queuenum;
-       u16     queues_total;
-       u16     flags;
+       enum nft_registers      sreg_qnum:8;
+       u16                     queuenum;
+       u16                     queues_total;
+       u16                     flags;
 };
 
 static void nft_queue_eval(const struct nft_expr *expr,
@@ -54,31 +55,78 @@ static void nft_queue_eval(const struct nft_expr *expr,
        regs->verdict.code = ret;
 }
 
+static void nft_queue_sreg_eval(const struct nft_expr *expr,
+                               struct nft_regs *regs,
+                               const struct nft_pktinfo *pkt)
+{
+       struct nft_queue *priv = nft_expr_priv(expr);
+       u32 queue, ret;
+
+       queue = regs->data[priv->sreg_qnum];
+
+       ret = NF_QUEUE_NR(queue);
+       if (priv->flags & NFT_QUEUE_FLAG_BYPASS)
+               ret |= NF_VERDICT_FLAG_QUEUE_BYPASS;
+
+       regs->verdict.code = ret;
+}
+
 static const struct nla_policy nft_queue_policy[NFTA_QUEUE_MAX + 1] = {
        [NFTA_QUEUE_NUM]        = { .type = NLA_U16 },
        [NFTA_QUEUE_TOTAL]      = { .type = NLA_U16 },
        [NFTA_QUEUE_FLAGS]      = { .type = NLA_U16 },
+       [NFTA_QUEUE_SREG_QNUM]  = { .type = NLA_U32 },
 };
 
 static int nft_queue_init(const struct nft_ctx *ctx,
-                          const struct nft_expr *expr,
-                          const struct nlattr * const tb[])
+                         const struct nft_expr *expr,
+                         const struct nlattr * const tb[])
 {
        struct nft_queue *priv = nft_expr_priv(expr);
+       u32 maxid;
 
-       if (tb[NFTA_QUEUE_NUM] == NULL)
-               return -EINVAL;
-
-       init_hashrandom(&jhash_initval);
        priv->queuenum = ntohs(nla_get_be16(tb[NFTA_QUEUE_NUM]));
 
-       if (tb[NFTA_QUEUE_TOTAL] != NULL)
+       if (tb[NFTA_QUEUE_TOTAL])
                priv->queues_total = ntohs(nla_get_be16(tb[NFTA_QUEUE_TOTAL]));
-       if (tb[NFTA_QUEUE_FLAGS] != NULL) {
+       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]) {
+               priv->flags = ntohs(nla_get_be16(tb[NFTA_QUEUE_FLAGS]));
+               if (priv->flags & ~NFT_QUEUE_FLAG_MASK)
+                       return -EINVAL;
+       }
+       return 0;
+}
+
+static int nft_queue_sreg_init(const struct nft_ctx *ctx,
+                              const struct nft_expr *expr,
+                              const struct nlattr * const tb[])
+{
+       struct nft_queue *priv = nft_expr_priv(expr);
+       int err;
+
+       priv->sreg_qnum = nft_parse_register(tb[NFTA_QUEUE_SREG_QNUM]);
+       err = nft_validate_register_load(priv->sreg_qnum, sizeof(u32));
+       if (err < 0)
+               return err;
+
+       if (tb[NFTA_QUEUE_FLAGS]) {
                priv->flags = ntohs(nla_get_be16(tb[NFTA_QUEUE_FLAGS]));
                if (priv->flags & ~NFT_QUEUE_FLAG_MASK)
                        return -EINVAL;
+               if (priv->flags & NFT_QUEUE_FLAG_CPU_FANOUT)
+                       return -EOPNOTSUPP;
        }
+
        return 0;
 }
 
@@ -97,6 +145,21 @@ nla_put_failure:
        return -1;
 }
 
+static int
+nft_queue_sreg_dump(struct sk_buff *skb, const struct nft_expr *expr)
+{
+       const struct nft_queue *priv = nft_expr_priv(expr);
+
+       if (nft_dump_register(skb, NFTA_QUEUE_SREG_QNUM, priv->sreg_qnum) ||
+           nla_put_be16(skb, NFTA_QUEUE_FLAGS, htons(priv->flags)))
+               goto nla_put_failure;
+
+       return 0;
+
+nla_put_failure:
+       return -1;
+}
+
 static struct nft_expr_type nft_queue_type;
 static const struct nft_expr_ops nft_queue_ops = {
        .type           = &nft_queue_type,
@@ -106,9 +169,35 @@ static const struct nft_expr_ops nft_queue_ops = {
        .dump           = nft_queue_dump,
 };
 
+static const struct nft_expr_ops nft_queue_sreg_ops = {
+       .type           = &nft_queue_type,
+       .size           = NFT_EXPR_SIZE(sizeof(struct nft_queue)),
+       .eval           = nft_queue_sreg_eval,
+       .init           = nft_queue_sreg_init,
+       .dump           = nft_queue_sreg_dump,
+};
+
+static const struct nft_expr_ops *
+nft_queue_select_ops(const struct nft_ctx *ctx,
+                    const struct nlattr * const tb[])
+{
+       if (tb[NFTA_QUEUE_NUM] && tb[NFTA_QUEUE_SREG_QNUM])
+               return ERR_PTR(-EINVAL);
+
+       init_hashrandom(&jhash_initval);
+
+       if (tb[NFTA_QUEUE_NUM])
+               return &nft_queue_ops;
+
+       if (tb[NFTA_QUEUE_SREG_QNUM])
+               return &nft_queue_sreg_ops;
+
+       return ERR_PTR(-EINVAL);
+}
+
 static struct nft_expr_type nft_queue_type __read_mostly = {
        .name           = "queue",
-       .ops            = &nft_queue_ops,
+       .select_ops     = &nft_queue_select_ops,
        .policy         = nft_queue_policy,
        .maxattr        = NFTA_QUEUE_MAX,
        .owner          = THIS_MODULE,