hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netfilter: nf_tables: fix log/queue expressions for NFPROTO_INET 

The log and queue expressions both store the family during ->init() and
use it to deliver packets. This is wrong when used in NFPROTO_INET since
they should both deliver to the actual AF of the packet, not the dummy
NFPROTO_INET.

Use the family from the hook ops to fix this.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Patrick McHardy 2014-02-06 09:17:41 +00:00 committed by Pablo Neira Ayuso
parent 05513e9e33
commit b8ecbee67c
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/netfilter/nft_log.c
View File

@ -23,7 +23,6 @@ static const char *nft_log_null_prefix = "";
struct nft_log { struct nft_log {
struct nf_loginfo loginfo; struct nf_loginfo loginfo;
char *prefix; char *prefix;
int family;
}; };
static void nft_log_eval(const struct nft_expr *expr, static void nft_log_eval(const struct nft_expr *expr,
@ -33,7 +32,7 @@ static void nft_log_eval(const struct nft_expr *expr,
const struct nft_log *priv = nft_expr_priv(expr); const struct nft_log *priv = nft_expr_priv(expr);
struct net *net = dev_net(pkt->in ? pkt->in : pkt->out); struct net *net = dev_net(pkt->in ? pkt->in : pkt->out);
nf_log_packet(net, priv->family, pkt->ops->hooknum, pkt->skb, pkt->in, nf_log_packet(net, pkt->ops->pf, pkt->ops->hooknum, pkt->skb, pkt->in,
pkt->out, &priv->loginfo, "%s", priv->prefix); pkt->out, &priv->loginfo, "%s", priv->prefix);
} }
@ -52,8 +51,6 @@ static int nft_log_init(const struct nft_ctx *ctx,
struct nf_loginfo *li = &priv->loginfo; struct nf_loginfo *li = &priv->loginfo;
const struct nlattr *nla; const struct nlattr *nla;
priv->family = ctx->afi->family;
nla = tb[NFTA_LOG_PREFIX]; nla = tb[NFTA_LOG_PREFIX];
if (nla != NULL) { if (nla != NULL) {
priv->prefix = kmalloc(nla_len(nla) + 1, GFP_KERNEL); priv->prefix = kmalloc(nla_len(nla) + 1, GFP_KERNEL);

4
net/netfilter/nft_queue.c
View File

@ -25,7 +25,6 @@ struct nft_queue {
u16 queuenum; u16 queuenum;
u16 queues_total; u16 queues_total;
u16 flags; u16 flags;
u8 family;
}; };
static void nft_queue_eval(const struct nft_expr *expr, static void nft_queue_eval(const struct nft_expr *expr,
@ -43,7 +42,7 @@ static void nft_queue_eval(const struct nft_expr *expr,
queue = priv->queuenum + cpu % priv->queues_total; queue = priv->queuenum + cpu % priv->queues_total;
} else { } else {
queue = nfqueue_hash(pkt->skb, queue, queue = nfqueue_hash(pkt->skb, queue,
priv->queues_total, priv->family, priv->queues_total, pkt->ops->pf,
jhash_initval); jhash_initval);
} }
} }
@ -71,7 +70,6 @@ static int nft_queue_init(const struct nft_ctx *ctx,
return -EINVAL; return -EINVAL;
init_hashrandom(&jhash_initval); init_hashrandom(&jhash_initval);
priv->family = ctx->afi->family;
priv->queuenum = ntohs(nla_get_be16(tb[NFTA_QUEUE_NUM])); priv->queuenum = ntohs(nla_get_be16(tb[NFTA_QUEUE_NUM]));
if (tb[NFTA_QUEUE_TOTAL] != NULL) if (tb[NFTA_QUEUE_TOTAL] != NULL)