@@ -198,7 +198,7 @@ static inline void nf_bridge_save_header(struct sk_buff *skb)
* expected format
*/
-static int br_parse_ip_options(struct sk_buff *skb)
+static int br_validate_ipv4(struct sk_buff *skb)
{
const struct iphdr *iph;
struct net_device *dev = skb->dev;
@@ -300,7 +300,7 @@ bad:
return -1;
}
-/* Equivalent to br_parse_ip_options for IPv6 */
+/* Equivalent to br_validate_ipv4 for IPv6 */
static int br_validate_ipv6(struct sk_buff *skb)
{
const struct ipv6hdr *hdr;
@@ -718,7 +718,7 @@ static unsigned int br_nf_pre_routing(const struct nf_hook_ops *ops,
nf_bridge_pull_encap_header_rcsum(skb);
- if (br_parse_ip_options(skb))
+ if (br_validate_ipv4(skb))
return NF_DROP;
nf_bridge_put(skb->nf_bridge);
@@ -819,7 +819,7 @@ static unsigned int br_nf_forward_ip(const struct nf_hook_ops *ops,
nf_bridge->mask |= BRNF_PKT_TYPE;
}
- if (pf == NFPROTO_IPV4 && br_parse_ip_options(skb))
+ if (pf == NFPROTO_IPV4 && br_validate_ipv4(skb))
return NF_DROP;
/* The physdev module checks on this */
@@ -914,7 +914,7 @@ static int br_nf_dev_queue_xmit(struct sk_buff *skb)
* boundaries by preserving frag_list rather than refragmenting.
*/
if (skb->protocol == htons(ETH_P_IP)) {
- if (br_parse_ip_options(skb))
+ if (br_validate_ipv4(skb))
/* Drop invalid packet */
return NF_DROP;
IPCB(skb)->frag_max_size = BR_INPUT_SKB_CB(skb)->frag_max_size;
br_parse_ip_options() does not parse any IP options, it validates IP packets as a whole and the function name is misleading. Rename br_parse_ip_options(). Signed-off-by: Bernhard Thaler <bernhard.thaler@wvnet.at> --- v4 * re-post due to errors in v3 formatting introduced by my MUA v3 * re-assignment of iph variable needed because pskb_may_pull() can invalidate the network header * same patch as v1 again v2 * first patch did not contain statement removing double iph variable assignment net/bridge/br_netfilter.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)