ipp2p: partial revert of 3c8131b9

Revert part of 3c8131b976.

The transport header offset is not (yet) set by the time Netfilter
is invoked so using tcp_hdr/udp_hdr has undefined behavior.
This commit is contained in:
Jan Engelhardt
2009-01-10 08:23:27 +01:00
parent 4cdfd49637
commit fbbca68790

View File

@@ -837,7 +837,7 @@ ipp2p_mt(const struct sk_buff *skb, const struct xt_match_param *par)
switch (ip->protocol) { switch (ip->protocol) {
case IPPROTO_TCP: /* what to do with a TCP packet */ case IPPROTO_TCP: /* what to do with a TCP packet */
{ {
const struct tcphdr *tcph = tcp_hdr(skb); const struct tcphdr *tcph = (const void *)ip + ip_hdrlen(skb);
if (tcph->fin) return 0; /* if FIN bit is set bail out */ if (tcph->fin) return 0; /* if FIN bit is set bail out */
if (tcph->syn) return 0; /* if SYN bit is set bail out */ if (tcph->syn) return 0; /* if SYN bit is set bail out */
@@ -864,7 +864,7 @@ ipp2p_mt(const struct sk_buff *skb, const struct xt_match_param *par)
case IPPROTO_UDP: /* what to do with an UDP packet */ case IPPROTO_UDP: /* what to do with an UDP packet */
{ {
const struct udphdr *udph = udp_hdr(skb); const struct udphdr *udph = (const void *)ip + ip_hdrlen(skb);
while (udp_list[i].command) { while (udp_list[i].command) {
if ((info->cmd & udp_list[i].command) == udp_list[i].command && if ((info->cmd & udp_list[i].command) == udp_list[i].command &&