netfilter: nfnetlink: work around wrong endianess in res_id field
The convention in nfnetlink is to use network byte order in every header field as well as in the attribute payload. The initial version of the batching infrastructure assumes that res_id comes in host byte order though. The only client of the batching infrastructure is nf_tables, so let's add a workaround to address this inconsistency. We currently have 11 nfnetlink subsystems according to NFNL_SUBSYS_COUNT, so we can assume that the subsystem 2560, ie. htons(10), will not be allocated anytime soon, so it can be an alias of nf_tables from the nfnetlink batching path when interpreting the res_id field. Based on original patch from Florian Westphal. Reported-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
96be5f2806
commit
a9de9777d6
|
@ -444,6 +444,7 @@ done:
|
||||||
static void nfnetlink_rcv(struct sk_buff *skb)
|
static void nfnetlink_rcv(struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
struct nlmsghdr *nlh = nlmsg_hdr(skb);
|
struct nlmsghdr *nlh = nlmsg_hdr(skb);
|
||||||
|
u_int16_t res_id;
|
||||||
int msglen;
|
int msglen;
|
||||||
|
|
||||||
if (nlh->nlmsg_len < NLMSG_HDRLEN ||
|
if (nlh->nlmsg_len < NLMSG_HDRLEN ||
|
||||||
|
@ -468,7 +469,12 @@ static void nfnetlink_rcv(struct sk_buff *skb)
|
||||||
|
|
||||||
nfgenmsg = nlmsg_data(nlh);
|
nfgenmsg = nlmsg_data(nlh);
|
||||||
skb_pull(skb, msglen);
|
skb_pull(skb, msglen);
|
||||||
nfnetlink_rcv_batch(skb, nlh, nfgenmsg->res_id);
|
/* Work around old nft using host byte order */
|
||||||
|
if (nfgenmsg->res_id == NFNL_SUBSYS_NFTABLES)
|
||||||
|
res_id = NFNL_SUBSYS_NFTABLES;
|
||||||
|
else
|
||||||
|
res_id = ntohs(nfgenmsg->res_id);
|
||||||
|
nfnetlink_rcv_batch(skb, nlh, res_id);
|
||||||
} else {
|
} else {
|
||||||
netlink_rcv_skb(skb, &nfnetlink_rcv_msg);
|
netlink_rcv_skb(skb, &nfnetlink_rcv_msg);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue