Skip to content

L
linux
Commit 789bc3e5 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files
Options

[BRIDGE]: netfilter whitespace 

Run br_netfilter through Lindent to fix whitespace.
Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5513a7d
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 53 deletions
net/bridge/br_netfilter.c
View file @ 789bc3e5
...@@ -218,12 +218,17 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb) ...@@ -218,12 +218,17 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING; nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING;
if (dnat_took_place(skb)) { if (dnat_took_place(skb)) {
if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, dev)) {
dev)) {
struct rtable *rt; struct rtable *rt;
struct flowi fl = { .nl_u = struct flowi fl = {
{ .ip4_u = { .daddr = iph->daddr, .saddr = 0 , .nl_u = {
.tos = RT_TOS(iph->tos)} }, .proto = 0}; .ip4_u = {
.daddr = iph->daddr,
.saddr = 0,
.tos = RT_TOS(iph->tos) },
},
.proto = 0,
};
if (!ip_route_output_key(&rt, &fl)) { if (!ip_route_output_key(&rt, &fl)) {
/* - Bridged-and-DNAT'ed traffic doesn't /* - Bridged-and-DNAT'ed traffic doesn't
...@@ -257,8 +262,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb) ...@@ -257,8 +262,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
1); 1);
return 0; return 0;
} }
memcpy(eth_hdr(skb)->h_dest, dev->dev_addr, memcpy(eth_hdr(skb)->h_dest, dev->dev_addr, ETH_ALEN);
ETH_ALEN);
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
} }
} else { } else {
...@@ -297,10 +301,10 @@ static struct net_device *setup_pre_routing(struct sk_buff *skb) ...@@ -297,10 +301,10 @@ static struct net_device *setup_pre_routing(struct sk_buff *skb)
/* We only check the length. A bridge shouldn't do any hop-by-hop stuff anyway */ /* We only check the length. A bridge shouldn't do any hop-by-hop stuff anyway */
static int check_hbh_len(struct sk_buff *skb) static int check_hbh_len(struct sk_buff *skb)
{ {
unsigned char *raw = (u8*)(skb->nh.ipv6h+1); unsigned char *raw = (u8 *) (skb->nh.ipv6h + 1);
u32 pkt_len; u32 pkt_len;
int off = raw - skb->nh.raw; int off = raw - skb->nh.raw;
int len = (raw[1]+1)<<3; int len = (raw[1] + 1) << 3;
if ((raw + len) - skb->data > skb_headlen(skb)) if ((raw + len) - skb->data > skb_headlen(skb))
goto bad; goto bad;
...@@ -309,7 +313,7 @@ static int check_hbh_len(struct sk_buff *skb) ...@@ -309,7 +313,7 @@ static int check_hbh_len(struct sk_buff *skb)
len -= 2; len -= 2;
while (len > 0) { while (len > 0) {
int optlen = skb->nh.raw[off+1]+2; int optlen = skb->nh.raw[off + 1] + 2;
switch (skb->nh.raw[off]) { switch (skb->nh.raw[off]) {
case IPV6_TLV_PAD0: case IPV6_TLV_PAD0:
...@@ -320,16 +324,16 @@ static int check_hbh_len(struct sk_buff *skb) ...@@ -320,16 +324,16 @@ static int check_hbh_len(struct sk_buff *skb)
break; break;
case IPV6_TLV_JUMBO: case IPV6_TLV_JUMBO:
if (skb->nh.raw[off+1] != 4 || (off&3) != 2) if (skb->nh.raw[off + 1] != 4 || (off & 3) != 2)
goto bad; goto bad;
pkt_len = ntohl(*(u32*)(skb->nh.raw+off+2)); pkt_len = ntohl(*(u32 *) (skb->nh.raw + off + 2));
if (pkt_len <= IPV6_MAXPLEN || if (pkt_len <= IPV6_MAXPLEN ||
skb->nh.ipv6h->payload_len) skb->nh.ipv6h->payload_len)
goto bad; goto bad;
if (pkt_len > skb->len - sizeof(struct ipv6hdr)) if (pkt_len > skb->len - sizeof(struct ipv6hdr))
goto bad; goto bad;
if (pskb_trim_rcsum(skb, if (pskb_trim_rcsum(skb,
pkt_len+sizeof(struct ipv6hdr))) pkt_len + sizeof(struct ipv6hdr)))
goto bad; goto bad;
break; break;
default: default:
...@@ -350,8 +354,10 @@ static int check_hbh_len(struct sk_buff *skb) ...@@ -350,8 +354,10 @@ static int check_hbh_len(struct sk_buff *skb)
/* Replicate the checks that IPv6 does on packet reception and pass the packet /* Replicate the checks that IPv6 does on packet reception and pass the packet
* to ip6tables, which doesn't support NAT, so things are fairly simple. */ * to ip6tables, which doesn't support NAT, so things are fairly simple. */
static unsigned int br_nf_pre_routing_ipv6(unsigned int hook, static unsigned int br_nf_pre_routing_ipv6(unsigned int hook,
struct sk_buff *skb, const struct net_device *in, struct sk_buff *skb,
const struct net_device *out, int (*okfn)(struct sk_buff *)) const struct net_device *in,
const struct net_device *out,
int (*okfn)(struct sk_buff *))
{ {
struct ipv6hdr *hdr; struct ipv6hdr *hdr;
u32 pkt_len; u32 pkt_len;
...@@ -452,15 +458,15 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb, ...@@ -452,15 +458,15 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
if (iph->ihl < 5 || iph->version != 4) if (iph->ihl < 5 || iph->version != 4)
goto inhdr_error; goto inhdr_error;
if (!pskb_may_pull(skb, 4*iph->ihl)) if (!pskb_may_pull(skb, 4 * iph->ihl))
goto inhdr_error; goto inhdr_error;
iph = skb->nh.iph; iph = skb->nh.iph;
if (ip_fast_csum((__u8 *)iph, iph->ihl) != 0) if (ip_fast_csum((__u8 *) iph, iph->ihl) != 0)
goto inhdr_error; goto inhdr_error;
len = ntohs(iph->tot_len); len = ntohs(iph->tot_len);
if (skb->len < len || len < 4*iph->ihl) if (skb->len < len || len < 4 * iph->ihl)
goto inhdr_error; goto inhdr_error;
if (skb->len > len) { if (skb->len > len) {
...@@ -496,7 +502,8 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb, ...@@ -496,7 +502,8 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
* register an IPv4 PRE_ROUTING 'sabotage' hook that will * register an IPv4 PRE_ROUTING 'sabotage' hook that will
* prevent this from happening. */ * prevent this from happening. */
static unsigned int br_nf_local_in(unsigned int hook, struct sk_buff **pskb, static unsigned int br_nf_local_in(unsigned int hook, struct sk_buff **pskb,
const struct net_device *in, const struct net_device *out, const struct net_device *in,
const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
struct sk_buff *skb = *pskb; struct sk_buff *skb = *pskb;
...@@ -509,7 +516,6 @@ static unsigned int br_nf_local_in(unsigned int hook, struct sk_buff **pskb, ...@@ -509,7 +516,6 @@ static unsigned int br_nf_local_in(unsigned int hook, struct sk_buff **pskb,
return NF_ACCEPT; return NF_ACCEPT;
} }
/* PF_BRIDGE/FORWARD *************************************************/ /* PF_BRIDGE/FORWARD *************************************************/
static int br_nf_forward_finish(struct sk_buff *skb) static int br_nf_forward_finish(struct sk_buff *skb)
{ {
...@@ -541,7 +547,8 @@ static int br_nf_forward_finish(struct sk_buff *skb) ...@@ -541,7 +547,8 @@ static int br_nf_forward_finish(struct sk_buff *skb)
* because of the physdev module. For ARP, indev and outdev are the * because of the physdev module. For ARP, indev and outdev are the
* bridge ports. */ * bridge ports. */
static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb, static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb,
const struct net_device *in, const struct net_device *out, const struct net_device *in,
const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
struct sk_buff *skb = *pskb; struct sk_buff *skb = *pskb;
...@@ -584,7 +591,8 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb, ...@@ -584,7 +591,8 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb,
} }
static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb, static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb,
const struct net_device *in, const struct net_device *out, const struct net_device *in,
const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
struct sk_buff *skb = *pskb; struct sk_buff *skb = *pskb;
...@@ -617,7 +625,6 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb, ...@@ -617,7 +625,6 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb,
return NF_STOLEN; return NF_STOLEN;
} }
/* PF_BRIDGE/LOCAL_OUT ***********************************************/ /* PF_BRIDGE/LOCAL_OUT ***********************************************/
static int br_nf_local_out_finish(struct sk_buff *skb) static int br_nf_local_out_finish(struct sk_buff *skb)
{ {
...@@ -653,7 +660,8 @@ static int br_nf_local_out_finish(struct sk_buff *skb) ...@@ -653,7 +660,8 @@ static int br_nf_local_out_finish(struct sk_buff *skb)
* even routed packets that didn't arrive on a bridge interface have their * even routed packets that didn't arrive on a bridge interface have their
* nf_bridge->physindev set. */ * nf_bridge->physindev set. */
static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb, static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb,
const struct net_device *in, const struct net_device *out, const struct net_device *in,
const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
struct net_device *realindev, *realoutdev; struct net_device *realindev, *realoutdev;
...@@ -716,7 +724,7 @@ static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb, ...@@ -716,7 +724,7 @@ static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb,
/* IP forwarded traffic has a physindev, locally /* IP forwarded traffic has a physindev, locally
* generated traffic hasn't. */ * generated traffic hasn't. */
if (realindev != NULL) { if (realindev != NULL) {
if (!(nf_bridge->mask & BRNF_DONT_TAKE_PARENT) ) { if (!(nf_bridge->mask & BRNF_DONT_TAKE_PARENT)) {
struct net_device *parent = bridge_parent(realindev); struct net_device *parent = bridge_parent(realindev);
if (parent) if (parent)
realindev = parent; realindev = parent;
...@@ -738,7 +746,8 @@ static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb, ...@@ -738,7 +746,8 @@ static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb,
/* PF_BRIDGE/POST_ROUTING ********************************************/ /* PF_BRIDGE/POST_ROUTING ********************************************/
static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
const struct net_device *in, const struct net_device *out, const struct net_device *in,
const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
struct sk_buff *skb = *pskb; struct sk_buff *skb = *pskb;
...@@ -811,12 +820,12 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, ...@@ -811,12 +820,12 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
#endif #endif
} }
/* IP/SABOTAGE *****************************************************/ /* IP/SABOTAGE *****************************************************/
/* Don't hand locally destined packets to PF_INET(6)/PRE_ROUTING /* Don't hand locally destined packets to PF_INET(6)/PRE_ROUTING
* for the second time. */ * for the second time. */
static unsigned int ip_sabotage_in(unsigned int hook, struct sk_buff **pskb, static unsigned int ip_sabotage_in(unsigned int hook, struct sk_buff **pskb,
const struct net_device *in, const struct net_device *out, const struct net_device *in,
const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
if ((*pskb)->nf_bridge && if ((*pskb)->nf_bridge &&
...@@ -831,15 +840,15 @@ static unsigned int ip_sabotage_in(unsigned int hook, struct sk_buff **pskb, ...@@ -831,15 +840,15 @@ static unsigned int ip_sabotage_in(unsigned int hook, struct sk_buff **pskb,
* and PF_INET(6)/POST_ROUTING until we have done the forwarding * and PF_INET(6)/POST_ROUTING until we have done the forwarding
* decision in the bridge code and have determined nf_bridge->physoutdev. */ * decision in the bridge code and have determined nf_bridge->physoutdev. */
static unsigned int ip_sabotage_out(unsigned int hook, struct sk_buff **pskb, static unsigned int ip_sabotage_out(unsigned int hook, struct sk_buff **pskb,
const struct net_device *in, const struct net_device *out, const struct net_device *in,
const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
struct sk_buff *skb = *pskb; struct sk_buff *skb = *pskb;
if ((out->hard_start_xmit == br_dev_xmit && if ((out->hard_start_xmit == br_dev_xmit &&
okfn != br_nf_forward_finish && okfn != br_nf_forward_finish &&
okfn != br_nf_local_out_finish && okfn != br_nf_local_out_finish && okfn != br_dev_queue_push_xmit)
okfn != br_dev_queue_push_xmit)
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
|| ((out->priv_flags & IFF_802_1Q_VLAN) && || ((out->priv_flags & IFF_802_1Q_VLAN) &&
VLAN_DEV_INFO(out)->real_dev->hard_start_xmit == br_dev_xmit) VLAN_DEV_INFO(out)->real_dev->hard_start_xmit == br_dev_xmit)
...@@ -967,8 +976,8 @@ static struct nf_hook_ops br_nf_ops[] = { ...@@ -967,8 +976,8 @@ static struct nf_hook_ops br_nf_ops[] = {
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
static static
int brnf_sysctl_call_tables(ctl_table *ctl, int write, struct file * filp, int brnf_sysctl_call_tables(ctl_table * ctl, int write, struct file *filp,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user * buffer, size_t * lenp, loff_t * ppos)
{ {
int ret; int ret;
...@@ -1055,7 +1064,8 @@ int br_netfilter_init(void) ...@@ -1055,7 +1064,8 @@ int br_netfilter_init(void)
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
brnf_sysctl_header = register_sysctl_table(brnf_net_table, 0); brnf_sysctl_header = register_sysctl_table(brnf_net_table, 0);
if (brnf_sysctl_header == NULL) { if (brnf_sysctl_header == NULL) {
printk(KERN_WARNING "br_netfilter: can't register to sysctl.\n"); printk(KERN_WARNING
"br_netfilter: can't register to sysctl.\n");
for (i = 0; i < ARRAY_SIZE(br_nf_ops); i++) for (i = 0; i < ARRAY_SIZE(br_nf_ops); i++)
nf_unregister_hook(&br_nf_ops[i]); nf_unregister_hook(&br_nf_ops[i]);
return -EFAULT; return -EFAULT;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7