malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[NETFILTER]: nfnetlink_queue: use endianness-aware attribute functions

Browse Source 
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2007-12-05 01:30:02 -08:00 committed by David S. Miller
parent 9d6023ab8b
commit ea3a66ff5a
1 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
net/netfilter/nfnetlink_queue.c
View File

@ -215,7 +215,6 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
struct sk_buff *entskb = entry->skb; struct sk_buff *entskb = entry->skb;
struct net_device *indev; struct net_device *indev;
struct net_device *outdev; struct net_device *outdev;
__be32 tmp_uint;
size = NLMSG_ALIGN(sizeof(struct nfgenmsg)) size = NLMSG_ALIGN(sizeof(struct nfgenmsg))
+ nla_total_size(sizeof(struct nfqnl_msg_packet_hdr)) + nla_total_size(sizeof(struct nfqnl_msg_packet_hdr))
@ -286,69 +285,57 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
indev = entry->indev; indev = entry->indev;
if (indev) { if (indev) {
tmp_uint = htonl(indev->ifindex);
#ifndef CONFIG_BRIDGE_NETFILTER #ifndef CONFIG_BRIDGE_NETFILTER
NLA_PUT(skb, NFQA_IFINDEX_INDEV, sizeof(tmp_uint), &tmp_uint); NLA_PUT_BE32(skb, NFQA_IFINDEX_INDEV, htonl(indev->ifindex));
#else #else
if (entry->pf == PF_BRIDGE) { if (entry->pf == PF_BRIDGE) {
/* Case 1: indev is physical input device, we need to /* Case 1: indev is physical input device, we need to
* look for bridge group (when called from * look for bridge group (when called from
* netfilter_bridge) */ * netfilter_bridge) */
NLA_PUT(skb, NFQA_IFINDEX_PHYSINDEV, sizeof(tmp_uint), NLA_PUT_BE32(skb, NFQA_IFINDEX_PHYSINDEV,
&tmp_uint); htonl(indev->ifindex));
/* this is the bridge group "brX" */ /* this is the bridge group "brX" */
tmp_uint = htonl(indev->br_port->br->dev->ifindex); NLA_PUT_BE32(skb, NFQA_IFINDEX_INDEV,
NLA_PUT(skb, NFQA_IFINDEX_INDEV, sizeof(tmp_uint), htonl(indev->br_port->br->dev->ifindex));
&tmp_uint);
} else { } else {
/* Case 2: indev is bridge group, we need to look for /* Case 2: indev is bridge group, we need to look for
* physical device (when called from ipv4) */ * physical device (when called from ipv4) */
NLA_PUT(skb, NFQA_IFINDEX_INDEV, sizeof(tmp_uint), NLA_PUT_BE32(skb, NFQA_IFINDEX_INDEV,
&tmp_uint); htonl(indev->ifindex));
if (entskb->nf_bridge if (entskb->nf_bridge && entskb->nf_bridge->physindev)
&& entskb->nf_bridge->physindev) { NLA_PUT_BE32(skb, NFQA_IFINDEX_PHYSINDEV,
tmp_uint = htonl(entskb->nf_bridge->physindev->ifindex); htonl(entskb->nf_bridge->physindev->ifindex));
NLA_PUT(skb, NFQA_IFINDEX_PHYSINDEV,
sizeof(tmp_uint), &tmp_uint);
}
} }
#endif #endif
} }
if (outdev) { if (outdev) {
tmp_uint = htonl(outdev->ifindex);
#ifndef CONFIG_BRIDGE_NETFILTER #ifndef CONFIG_BRIDGE_NETFILTER
NLA_PUT(skb, NFQA_IFINDEX_OUTDEV, sizeof(tmp_uint), &tmp_uint); NLA_PUT_BE32(skb, NFQA_IFINDEX_OUTDEV, htonl(outdev->ifindex));
#else #else
if (entry->pf == PF_BRIDGE) { if (entry->pf == PF_BRIDGE) {
/* Case 1: outdev is physical output device, we need to /* Case 1: outdev is physical output device, we need to
* look for bridge group (when called from * look for bridge group (when called from
* netfilter_bridge) */ * netfilter_bridge) */
NLA_PUT(skb, NFQA_IFINDEX_PHYSOUTDEV, sizeof(tmp_uint), NLA_PUT_BE32(skb, NFQA_IFINDEX_PHYSOUTDEV,
&tmp_uint); htonl(outdev->ifindex));
/* this is the bridge group "brX" */ /* this is the bridge group "brX" */
tmp_uint = htonl(outdev->br_port->br->dev->ifindex); NLA_PUT_BE32(skb, NFQA_IFINDEX_OUTDEV,
NLA_PUT(skb, NFQA_IFINDEX_OUTDEV, sizeof(tmp_uint), htonl(outdev->br_port->br->dev->ifindex));
&tmp_uint);
} else { } else {
/* Case 2: outdev is bridge group, we need to look for /* Case 2: outdev is bridge group, we need to look for
* physical output device (when called from ipv4) */ * physical output device (when called from ipv4) */
NLA_PUT(skb, NFQA_IFINDEX_OUTDEV, sizeof(tmp_uint), NLA_PUT_BE32(skb, NFQA_IFINDEX_OUTDEV,
&tmp_uint); htonl(outdev->ifindex));
if (entskb->nf_bridge if (entskb->nf_bridge && entskb->nf_bridge->physoutdev)
&& entskb->nf_bridge->physoutdev) { NLA_PUT_BE32(skb, NFQA_IFINDEX_PHYSOUTDEV,
tmp_uint = htonl(entskb->nf_bridge->physoutdev->ifindex); htonl(entskb->nf_bridge->physoutdev->ifindex));
NLA_PUT(skb, NFQA_IFINDEX_PHYSOUTDEV,
sizeof(tmp_uint), &tmp_uint);
}
} }
#endif #endif
} }
if (entskb->mark) { if (entskb->mark)
tmp_uint = htonl(entskb->mark); NLA_PUT_BE32(skb, NFQA_MARK, htonl(entskb->mark));
NLA_PUT(skb, NFQA_MARK, sizeof(u_int32_t), &tmp_uint);
}
if (indev && entskb->dev) { if (indev && entskb->dev) {
struct nfqnl_msg_packet_hw phw; struct nfqnl_msg_packet_hw phw;
@ -670,8 +657,7 @@ nfqnl_recv_verdict(struct sock *ctnl, struct sk_buff *skb,
} }
if (nfqa[NFQA_MARK]) if (nfqa[NFQA_MARK])
entry->skb->mark = ntohl(*(__be32 *) entry->skb->mark = ntohl(nla_get_be32(nfqa[NFQA_MARK]));
nla_data(nfqa[NFQA_MARK]));
nf_reinject(entry, verdict); nf_reinject(entry, verdict);
return 0; return 0;