mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
bridge: simplify ip_mc_check_igmp() and ipv6_mc_check_mld() calls
This patch refactors ip_mc_check_igmp(), ipv6_mc_check_mld() and their callers (more precisely, the Linux bridge) to not rely on the skb_trimmed parameter anymore. An skb with its tail trimmed to the IP packet length was initially introduced for the following three reasons: 1) To be able to verify the ICMPv6 checksum. 2) To be able to distinguish the version of an IGMP or MLD query. They are distinguishable only by their size. 3) To avoid parsing data for an IGMPv3 or MLDv2 report that is beyond the IP packet but still within the skb. The first case still uses a cloned and potentially trimmed skb to verfiy. However, there is no need to propagate it to the caller. For the second and third case explicit IP packet length checks were added. This hopefully makes ip_mc_check_igmp() and ipv6_mc_check_mld() easier to read and verfiy, as well as easier to use. Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6679cf099b
commit
ba5ea61462
8 changed files with 70 additions and 72 deletions
|
@ -34,4 +34,9 @@ static inline struct iphdr *ipip_hdr(const struct sk_buff *skb)
|
|||
{
|
||||
return (struct iphdr *)skb_transport_header(skb);
|
||||
}
|
||||
|
||||
static inline unsigned int ip_transport_len(const struct sk_buff *skb)
|
||||
{
|
||||
return ntohs(ip_hdr(skb)->tot_len) - skb_network_header_len(skb);
|
||||
}
|
||||
#endif /* _LINUX_IP_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue