Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
This commit is contained in:
@@ -384,11 +384,11 @@ static int mark_source_chains(struct xt_table_info *newinfo,
|
||||
|= ((1 << hook) | (1 << NF_ARP_NUMHOOKS));
|
||||
|
||||
/* Unconditional return/END. */
|
||||
if ((e->target_offset == sizeof(struct arpt_entry)
|
||||
&& (strcmp(t->target.u.user.name,
|
||||
ARPT_STANDARD_TARGET) == 0)
|
||||
&& t->verdict < 0
|
||||
&& unconditional(&e->arp)) || visited) {
|
||||
if ((e->target_offset == sizeof(struct arpt_entry) &&
|
||||
(strcmp(t->target.u.user.name,
|
||||
ARPT_STANDARD_TARGET) == 0) &&
|
||||
t->verdict < 0 && unconditional(&e->arp)) ||
|
||||
visited) {
|
||||
unsigned int oldpos, size;
|
||||
|
||||
if ((strcmp(t->target.u.user.name,
|
||||
@@ -427,8 +427,8 @@ static int mark_source_chains(struct xt_table_info *newinfo,
|
||||
int newpos = t->verdict;
|
||||
|
||||
if (strcmp(t->target.u.user.name,
|
||||
ARPT_STANDARD_TARGET) == 0
|
||||
&& newpos >= 0) {
|
||||
ARPT_STANDARD_TARGET) == 0 &&
|
||||
newpos >= 0) {
|
||||
if (newpos > newinfo->size -
|
||||
sizeof(struct arpt_entry)) {
|
||||
duprintf("mark_source_chains: "
|
||||
@@ -559,8 +559,8 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e,
|
||||
{
|
||||
unsigned int h;
|
||||
|
||||
if ((unsigned long)e % __alignof__(struct arpt_entry) != 0
|
||||
|| (unsigned char *)e + sizeof(struct arpt_entry) >= limit) {
|
||||
if ((unsigned long)e % __alignof__(struct arpt_entry) != 0 ||
|
||||
(unsigned char *)e + sizeof(struct arpt_entry) >= limit) {
|
||||
duprintf("Bad offset %p\n", e);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -1251,8 +1251,8 @@ check_compat_entry_size_and_hooks(struct compat_arpt_entry *e,
|
||||
int ret, off, h;
|
||||
|
||||
duprintf("check_compat_entry_size_and_hooks %p\n", e);
|
||||
if ((unsigned long)e % __alignof__(struct compat_arpt_entry) != 0
|
||||
|| (unsigned char *)e + sizeof(struct compat_arpt_entry) >= limit) {
|
||||
if ((unsigned long)e % __alignof__(struct compat_arpt_entry) != 0 ||
|
||||
(unsigned char *)e + sizeof(struct compat_arpt_entry) >= limit) {
|
||||
duprintf("Bad offset %p, limit = %p\n", e, limit);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@@ -497,8 +497,7 @@ ipq_rcv_nl_event(struct notifier_block *this,
|
||||
{
|
||||
struct netlink_notify *n = ptr;
|
||||
|
||||
if (event == NETLINK_URELEASE &&
|
||||
n->protocol == NETLINK_FIREWALL && n->pid) {
|
||||
if (event == NETLINK_URELEASE && n->protocol == NETLINK_FIREWALL) {
|
||||
write_lock_bh(&queue_lock);
|
||||
if ((net_eq(n->net, &init_net)) && (n->pid == peer_pid))
|
||||
__ipq_reset();
|
||||
@@ -622,7 +621,7 @@ cleanup_netlink_notifier:
|
||||
static void __exit ip_queue_fini(void)
|
||||
{
|
||||
nf_unregister_queue_handlers(&nfqh);
|
||||
synchronize_net();
|
||||
|
||||
ipq_flush(NULL, 0);
|
||||
|
||||
#ifdef CONFIG_SYSCTL
|
||||
|
@@ -89,9 +89,9 @@ ip_packet_match(const struct iphdr *ip,
|
||||
#define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
|
||||
|
||||
if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
|
||||
IPT_INV_SRCIP)
|
||||
|| FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
|
||||
IPT_INV_DSTIP)) {
|
||||
IPT_INV_SRCIP) ||
|
||||
FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
|
||||
IPT_INV_DSTIP)) {
|
||||
dprintf("Source or dest mismatch.\n");
|
||||
|
||||
dprintf("SRC: %pI4. Mask: %pI4. Target: %pI4.%s\n",
|
||||
@@ -122,8 +122,8 @@ ip_packet_match(const struct iphdr *ip,
|
||||
}
|
||||
|
||||
/* Check specific protocol */
|
||||
if (ipinfo->proto
|
||||
&& FWINV(ip->protocol != ipinfo->proto, IPT_INV_PROTO)) {
|
||||
if (ipinfo->proto &&
|
||||
FWINV(ip->protocol != ipinfo->proto, IPT_INV_PROTO)) {
|
||||
dprintf("Packet protocol %hi does not match %hi.%s\n",
|
||||
ip->protocol, ipinfo->proto,
|
||||
ipinfo->invflags&IPT_INV_PROTO ? " (INV)":"");
|
||||
@@ -246,11 +246,11 @@ get_chainname_rulenum(struct ipt_entry *s, struct ipt_entry *e,
|
||||
} else if (s == e) {
|
||||
(*rulenum)++;
|
||||
|
||||
if (s->target_offset == sizeof(struct ipt_entry)
|
||||
&& strcmp(t->target.u.kernel.target->name,
|
||||
IPT_STANDARD_TARGET) == 0
|
||||
&& t->verdict < 0
|
||||
&& unconditional(&s->ip)) {
|
||||
if (s->target_offset == sizeof(struct ipt_entry) &&
|
||||
strcmp(t->target.u.kernel.target->name,
|
||||
IPT_STANDARD_TARGET) == 0 &&
|
||||
t->verdict < 0 &&
|
||||
unconditional(&s->ip)) {
|
||||
/* Tail of chains: STANDARD target (return/policy) */
|
||||
*comment = *chainname == hookname
|
||||
? comments[NF_IP_TRACE_COMMENT_POLICY]
|
||||
@@ -388,8 +388,8 @@ ipt_do_table(struct sk_buff *skb,
|
||||
back = get_entry(table_base, back->comefrom);
|
||||
continue;
|
||||
}
|
||||
if (table_base + v != ipt_next_entry(e)
|
||||
&& !(e->ip.flags & IPT_F_GOTO)) {
|
||||
if (table_base + v != ipt_next_entry(e) &&
|
||||
!(e->ip.flags & IPT_F_GOTO)) {
|
||||
/* Save old back ptr in next entry */
|
||||
struct ipt_entry *next = ipt_next_entry(e);
|
||||
next->comefrom = (void *)back - table_base;
|
||||
@@ -473,11 +473,11 @@ mark_source_chains(struct xt_table_info *newinfo,
|
||||
e->comefrom |= ((1 << hook) | (1 << NF_INET_NUMHOOKS));
|
||||
|
||||
/* Unconditional return/END. */
|
||||
if ((e->target_offset == sizeof(struct ipt_entry)
|
||||
&& (strcmp(t->target.u.user.name,
|
||||
IPT_STANDARD_TARGET) == 0)
|
||||
&& t->verdict < 0
|
||||
&& unconditional(&e->ip)) || visited) {
|
||||
if ((e->target_offset == sizeof(struct ipt_entry) &&
|
||||
(strcmp(t->target.u.user.name,
|
||||
IPT_STANDARD_TARGET) == 0) &&
|
||||
t->verdict < 0 && unconditional(&e->ip)) ||
|
||||
visited) {
|
||||
unsigned int oldpos, size;
|
||||
|
||||
if ((strcmp(t->target.u.user.name,
|
||||
@@ -524,8 +524,8 @@ mark_source_chains(struct xt_table_info *newinfo,
|
||||
int newpos = t->verdict;
|
||||
|
||||
if (strcmp(t->target.u.user.name,
|
||||
IPT_STANDARD_TARGET) == 0
|
||||
&& newpos >= 0) {
|
||||
IPT_STANDARD_TARGET) == 0 &&
|
||||
newpos >= 0) {
|
||||
if (newpos > newinfo->size -
|
||||
sizeof(struct ipt_entry)) {
|
||||
duprintf("mark_source_chains: "
|
||||
@@ -735,8 +735,8 @@ check_entry_size_and_hooks(struct ipt_entry *e,
|
||||
{
|
||||
unsigned int h;
|
||||
|
||||
if ((unsigned long)e % __alignof__(struct ipt_entry) != 0
|
||||
|| (unsigned char *)e + sizeof(struct ipt_entry) >= limit) {
|
||||
if ((unsigned long)e % __alignof__(struct ipt_entry) != 0 ||
|
||||
(unsigned char *)e + sizeof(struct ipt_entry) >= limit) {
|
||||
duprintf("Bad offset %p\n", e);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -1548,8 +1548,8 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e,
|
||||
int ret, off, h;
|
||||
|
||||
duprintf("check_compat_entry_size_and_hooks %p\n", e);
|
||||
if ((unsigned long)e % __alignof__(struct compat_ipt_entry) != 0
|
||||
|| (unsigned char *)e + sizeof(struct compat_ipt_entry) >= limit) {
|
||||
if ((unsigned long)e % __alignof__(struct compat_ipt_entry) != 0 ||
|
||||
(unsigned char *)e + sizeof(struct compat_ipt_entry) >= limit) {
|
||||
duprintf("Bad offset %p, limit = %p\n", e, limit);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@@ -303,9 +303,9 @@ clusterip_tg(struct sk_buff *skb, const struct xt_target_param *par)
|
||||
|
||||
/* special case: ICMP error handling. conntrack distinguishes between
|
||||
* error messages (RELATED) and information requests (see below) */
|
||||
if (ip_hdr(skb)->protocol == IPPROTO_ICMP
|
||||
&& (ctinfo == IP_CT_RELATED
|
||||
|| ctinfo == IP_CT_RELATED+IP_CT_IS_REPLY))
|
||||
if (ip_hdr(skb)->protocol == IPPROTO_ICMP &&
|
||||
(ctinfo == IP_CT_RELATED ||
|
||||
ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY))
|
||||
return XT_CONTINUE;
|
||||
|
||||
/* ip_conntrack_icmp guarantees us that we only have ICMP_ECHO,
|
||||
@@ -362,8 +362,8 @@ static bool clusterip_tg_check(const struct xt_tgchk_param *par)
|
||||
return false;
|
||||
|
||||
}
|
||||
if (e->ip.dmsk.s_addr != htonl(0xffffffff)
|
||||
|| e->ip.dst.s_addr == 0) {
|
||||
if (e->ip.dmsk.s_addr != htonl(0xffffffff) ||
|
||||
e->ip.dst.s_addr == 0) {
|
||||
printk(KERN_ERR "CLUSTERIP: Please specify destination IP\n");
|
||||
return false;
|
||||
}
|
||||
@@ -495,14 +495,14 @@ arp_mangle(unsigned int hook,
|
||||
struct clusterip_config *c;
|
||||
|
||||
/* we don't care about non-ethernet and non-ipv4 ARP */
|
||||
if (arp->ar_hrd != htons(ARPHRD_ETHER)
|
||||
|| arp->ar_pro != htons(ETH_P_IP)
|
||||
|| arp->ar_pln != 4 || arp->ar_hln != ETH_ALEN)
|
||||
if (arp->ar_hrd != htons(ARPHRD_ETHER) ||
|
||||
arp->ar_pro != htons(ETH_P_IP) ||
|
||||
arp->ar_pln != 4 || arp->ar_hln != ETH_ALEN)
|
||||
return NF_ACCEPT;
|
||||
|
||||
/* we only want to mangle arp requests and replies */
|
||||
if (arp->ar_op != htons(ARPOP_REPLY)
|
||||
&& arp->ar_op != htons(ARPOP_REQUEST))
|
||||
if (arp->ar_op != htons(ARPOP_REPLY) &&
|
||||
arp->ar_op != htons(ARPOP_REQUEST))
|
||||
return NF_ACCEPT;
|
||||
|
||||
payload = (void *)(arp+1);
|
||||
|
@@ -85,8 +85,8 @@ ecn_tg(struct sk_buff *skb, const struct xt_target_param *par)
|
||||
if (!set_ect_ip(skb, einfo))
|
||||
return NF_DROP;
|
||||
|
||||
if (einfo->operation & (IPT_ECN_OP_SET_ECE | IPT_ECN_OP_SET_CWR)
|
||||
&& ip_hdr(skb)->protocol == IPPROTO_TCP)
|
||||
if (einfo->operation & (IPT_ECN_OP_SET_ECE | IPT_ECN_OP_SET_CWR) &&
|
||||
ip_hdr(skb)->protocol == IPPROTO_TCP)
|
||||
if (!set_ect_tcp(skb, einfo))
|
||||
return NF_DROP;
|
||||
|
||||
@@ -108,8 +108,8 @@ static bool ecn_tg_check(const struct xt_tgchk_param *par)
|
||||
einfo->ip_ect);
|
||||
return false;
|
||||
}
|
||||
if ((einfo->operation & (IPT_ECN_OP_SET_ECE|IPT_ECN_OP_SET_CWR))
|
||||
&& (e->ip.proto != IPPROTO_TCP || (e->ip.invflags & XT_INV_PROTO))) {
|
||||
if ((einfo->operation & (IPT_ECN_OP_SET_ECE|IPT_ECN_OP_SET_CWR)) &&
|
||||
(e->ip.proto != IPPROTO_TCP || (e->ip.invflags & XT_INV_PROTO))) {
|
||||
printk(KERN_WARNING "ECN: cannot use TCP operations on a "
|
||||
"non-tcp rule\n");
|
||||
return false;
|
||||
|
@@ -74,8 +74,8 @@ static void dump_packet(const struct nf_loginfo *info,
|
||||
if (ntohs(ih->frag_off) & IP_OFFSET)
|
||||
printk("FRAG:%u ", ntohs(ih->frag_off) & IP_OFFSET);
|
||||
|
||||
if ((logflags & IPT_LOG_IPOPT)
|
||||
&& ih->ihl * 4 > sizeof(struct iphdr)) {
|
||||
if ((logflags & IPT_LOG_IPOPT) &&
|
||||
ih->ihl * 4 > sizeof(struct iphdr)) {
|
||||
const unsigned char *op;
|
||||
unsigned char _opt[4 * 15 - sizeof(struct iphdr)];
|
||||
unsigned int i, optsize;
|
||||
@@ -146,8 +146,8 @@ static void dump_packet(const struct nf_loginfo *info,
|
||||
/* Max length: 11 "URGP=65535 " */
|
||||
printk("URGP=%u ", ntohs(th->urg_ptr));
|
||||
|
||||
if ((logflags & IPT_LOG_TCPOPT)
|
||||
&& th->doff * 4 > sizeof(struct tcphdr)) {
|
||||
if ((logflags & IPT_LOG_TCPOPT) &&
|
||||
th->doff * 4 > sizeof(struct tcphdr)) {
|
||||
unsigned char _opt[4 * 15 - sizeof(struct tcphdr)];
|
||||
const unsigned char *op;
|
||||
unsigned int i, optsize;
|
||||
@@ -238,9 +238,9 @@ static void dump_packet(const struct nf_loginfo *info,
|
||||
printk("TYPE=%u CODE=%u ", ich->type, ich->code);
|
||||
|
||||
/* Max length: 25 "INCOMPLETE [65535 bytes] " */
|
||||
if (ich->type <= NR_ICMP_TYPES
|
||||
&& required_len[ich->type]
|
||||
&& skb->len-iphoff-ih->ihl*4 < required_len[ich->type]) {
|
||||
if (ich->type <= NR_ICMP_TYPES &&
|
||||
required_len[ich->type] &&
|
||||
skb->len-iphoff-ih->ihl*4 < required_len[ich->type]) {
|
||||
printk("INCOMPLETE [%u bytes] ",
|
||||
skb->len - iphoff - ih->ihl*4);
|
||||
break;
|
||||
@@ -276,8 +276,8 @@ static void dump_packet(const struct nf_loginfo *info,
|
||||
}
|
||||
|
||||
/* Max length: 10 "MTU=65535 " */
|
||||
if (ich->type == ICMP_DEST_UNREACH
|
||||
&& ich->code == ICMP_FRAG_NEEDED)
|
||||
if (ich->type == ICMP_DEST_UNREACH &&
|
||||
ich->code == ICMP_FRAG_NEEDED)
|
||||
printk("MTU=%u ", ntohs(ich->un.frag.mtu));
|
||||
}
|
||||
break;
|
||||
@@ -407,8 +407,8 @@ ipt_log_packet(u_int8_t pf,
|
||||
if (in && !out) {
|
||||
/* MAC logging for input chain only. */
|
||||
printk("MAC=");
|
||||
if (skb->dev && skb->dev->hard_header_len
|
||||
&& skb->mac_header != skb->network_header) {
|
||||
if (skb->dev && skb->dev->hard_header_len &&
|
||||
skb->mac_header != skb->network_header) {
|
||||
int i;
|
||||
const unsigned char *p = skb_mac_header(skb);
|
||||
for (i = 0; i < skb->dev->hard_header_len; i++,p++)
|
||||
|
@@ -59,8 +59,8 @@ masquerade_tg(struct sk_buff *skb, const struct xt_target_param *par)
|
||||
ct = nf_ct_get(skb, &ctinfo);
|
||||
nat = nfct_nat(ct);
|
||||
|
||||
NF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED
|
||||
|| ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY));
|
||||
NF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||
|
||||
ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY));
|
||||
|
||||
/* Source address is 0.0.0.0 - locally generated packet that is
|
||||
* probably not supposed to be masqueraded.
|
||||
|
@@ -184,8 +184,8 @@ static bool reject_tg_check(const struct xt_tgchk_param *par)
|
||||
return false;
|
||||
} else if (rejinfo->with == IPT_TCP_RESET) {
|
||||
/* Must specify that it's a TCP packet */
|
||||
if (e->ip.proto != IPPROTO_TCP
|
||||
|| (e->ip.invflags & XT_INV_PROTO)) {
|
||||
if (e->ip.proto != IPPROTO_TCP ||
|
||||
(e->ip.invflags & XT_INV_PROTO)) {
|
||||
printk("ipt_REJECT: TCP_RESET invalid for non-tcp\n");
|
||||
return false;
|
||||
}
|
||||
|
@@ -226,9 +226,9 @@ static void ipt_ulog_packet(unsigned int hooknum,
|
||||
else
|
||||
*(pm->prefix) = '\0';
|
||||
|
||||
if (in && in->hard_header_len > 0
|
||||
&& skb->mac_header != skb->network_header
|
||||
&& in->hard_header_len <= ULOG_MAC_LEN) {
|
||||
if (in && in->hard_header_len > 0 &&
|
||||
skb->mac_header != skb->network_header &&
|
||||
in->hard_header_len <= ULOG_MAC_LEN) {
|
||||
memcpy(pm->mac, skb_mac_header(skb), in->hard_header_len);
|
||||
pm->mac_len = in->hard_header_len;
|
||||
} else
|
||||
|
@@ -96,8 +96,8 @@ static bool ecn_mt_check(const struct xt_mtchk_param *par)
|
||||
if (info->invert & IPT_ECN_OP_MATCH_MASK)
|
||||
return false;
|
||||
|
||||
if (info->operation & (IPT_ECN_OP_MATCH_ECE|IPT_ECN_OP_MATCH_CWR)
|
||||
&& ip->proto != IPPROTO_TCP) {
|
||||
if (info->operation & (IPT_ECN_OP_MATCH_ECE|IPT_ECN_OP_MATCH_CWR) &&
|
||||
ip->proto != IPPROTO_TCP) {
|
||||
printk(KERN_WARNING "ipt_ecn: can't match TCP bits in rule for"
|
||||
" non-tcp packets\n");
|
||||
return false;
|
||||
|
@@ -130,8 +130,8 @@ ipt_local_hook(unsigned int hook,
|
||||
u_int32_t mark;
|
||||
|
||||
/* root is playing with raw sockets. */
|
||||
if (skb->len < sizeof(struct iphdr)
|
||||
|| ip_hdrlen(skb) < sizeof(struct iphdr))
|
||||
if (skb->len < sizeof(struct iphdr) ||
|
||||
ip_hdrlen(skb) < sizeof(struct iphdr))
|
||||
return NF_ACCEPT;
|
||||
|
||||
/* Save things which could affect route */
|
||||
|
@@ -94,8 +94,8 @@ ipt_local_out_hook(unsigned int hook,
|
||||
int (*okfn)(struct sk_buff *))
|
||||
{
|
||||
/* Somebody is playing with raw sockets. */
|
||||
if (skb->len < sizeof(struct iphdr)
|
||||
|| ip_hdrlen(skb) < sizeof(struct iphdr))
|
||||
if (skb->len < sizeof(struct iphdr) ||
|
||||
ip_hdrlen(skb) < sizeof(struct iphdr))
|
||||
return NF_ACCEPT;
|
||||
return ipt_do_table(skb, hook, in, out,
|
||||
dev_net(out)->ipv4.iptable_security);
|
||||
|
@@ -54,8 +54,8 @@ static const u_int8_t invmap[] = {
|
||||
static bool icmp_invert_tuple(struct nf_conntrack_tuple *tuple,
|
||||
const struct nf_conntrack_tuple *orig)
|
||||
{
|
||||
if (orig->dst.u.icmp.type >= sizeof(invmap)
|
||||
|| !invmap[orig->dst.u.icmp.type])
|
||||
if (orig->dst.u.icmp.type >= sizeof(invmap) ||
|
||||
!invmap[orig->dst.u.icmp.type])
|
||||
return false;
|
||||
|
||||
tuple->src.u.icmp.id = orig->src.u.icmp.id;
|
||||
@@ -101,8 +101,8 @@ static bool icmp_new(struct nf_conn *ct, const struct sk_buff *skb,
|
||||
[ICMP_ADDRESS] = 1
|
||||
};
|
||||
|
||||
if (ct->tuplehash[0].tuple.dst.u.icmp.type >= sizeof(valid_new)
|
||||
|| !valid_new[ct->tuplehash[0].tuple.dst.u.icmp.type]) {
|
||||
if (ct->tuplehash[0].tuple.dst.u.icmp.type >= sizeof(valid_new) ||
|
||||
!valid_new[ct->tuplehash[0].tuple.dst.u.icmp.type]) {
|
||||
/* Can't create a new ICMP `conn' with this. */
|
||||
pr_debug("icmp: can't create new conn with type %u\n",
|
||||
ct->tuplehash[0].tuple.dst.u.icmp.type);
|
||||
@@ -201,11 +201,11 @@ icmp_error(struct net *net, struct sk_buff *skb, unsigned int dataoff,
|
||||
}
|
||||
|
||||
/* Need to track icmp error message? */
|
||||
if (icmph->type != ICMP_DEST_UNREACH
|
||||
&& icmph->type != ICMP_SOURCE_QUENCH
|
||||
&& icmph->type != ICMP_TIME_EXCEEDED
|
||||
&& icmph->type != ICMP_PARAMETERPROB
|
||||
&& icmph->type != ICMP_REDIRECT)
|
||||
if (icmph->type != ICMP_DEST_UNREACH &&
|
||||
icmph->type != ICMP_SOURCE_QUENCH &&
|
||||
icmph->type != ICMP_TIME_EXCEEDED &&
|
||||
icmph->type != ICMP_PARAMETERPROB &&
|
||||
icmph->type != ICMP_REDIRECT)
|
||||
return NF_ACCEPT;
|
||||
|
||||
return icmp_error_message(net, skb, ctinfo, hooknum);
|
||||
@@ -238,17 +238,17 @@ static const struct nla_policy icmp_nla_policy[CTA_PROTO_MAX+1] = {
|
||||
static int icmp_nlattr_to_tuple(struct nlattr *tb[],
|
||||
struct nf_conntrack_tuple *tuple)
|
||||
{
|
||||
if (!tb[CTA_PROTO_ICMP_TYPE]
|
||||
|| !tb[CTA_PROTO_ICMP_CODE]
|
||||
|| !tb[CTA_PROTO_ICMP_ID])
|
||||
if (!tb[CTA_PROTO_ICMP_TYPE] ||
|
||||
!tb[CTA_PROTO_ICMP_CODE] ||
|
||||
!tb[CTA_PROTO_ICMP_ID])
|
||||
return -EINVAL;
|
||||
|
||||
tuple->dst.u.icmp.type = nla_get_u8(tb[CTA_PROTO_ICMP_TYPE]);
|
||||
tuple->dst.u.icmp.code = nla_get_u8(tb[CTA_PROTO_ICMP_CODE]);
|
||||
tuple->src.u.icmp.id = nla_get_be16(tb[CTA_PROTO_ICMP_ID]);
|
||||
|
||||
if (tuple->dst.u.icmp.type >= sizeof(invmap)
|
||||
|| !invmap[tuple->dst.u.icmp.type])
|
||||
if (tuple->dst.u.icmp.type >= sizeof(invmap) ||
|
||||
!invmap[tuple->dst.u.icmp.type])
|
||||
return -EINVAL;
|
||||
|
||||
return 0;
|
||||
|
@@ -41,18 +41,14 @@ adjust_tcp_sequence(u32 seq,
|
||||
struct nf_conn *ct,
|
||||
enum ip_conntrack_info ctinfo)
|
||||
{
|
||||
int dir;
|
||||
struct nf_nat_seq *this_way, *other_way;
|
||||
enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
|
||||
struct nf_conn_nat *nat = nfct_nat(ct);
|
||||
struct nf_nat_seq *this_way = &nat->seq[dir];
|
||||
|
||||
pr_debug("adjust_tcp_sequence: seq = %u, sizediff = %d\n", seq, seq);
|
||||
pr_debug("adjust_tcp_sequence: seq = %u, sizediff = %d\n",
|
||||
seq, sizediff);
|
||||
|
||||
dir = CTINFO2DIR(ctinfo);
|
||||
|
||||
this_way = &nat->seq[dir];
|
||||
other_way = &nat->seq[!dir];
|
||||
|
||||
pr_debug("nf_nat_resize_packet: Seq_offset before: ");
|
||||
pr_debug("adjust_tcp_sequence: Seq_offset before: ");
|
||||
DUMP_OFFSET(this_way);
|
||||
|
||||
spin_lock_bh(&nf_nat_seqofs_lock);
|
||||
@@ -63,13 +59,13 @@ adjust_tcp_sequence(u32 seq,
|
||||
* retransmit */
|
||||
if (this_way->offset_before == this_way->offset_after ||
|
||||
before(this_way->correction_pos, seq)) {
|
||||
this_way->correction_pos = seq;
|
||||
this_way->offset_before = this_way->offset_after;
|
||||
this_way->offset_after += sizediff;
|
||||
this_way->correction_pos = seq;
|
||||
this_way->offset_before = this_way->offset_after;
|
||||
this_way->offset_after += sizediff;
|
||||
}
|
||||
spin_unlock_bh(&nf_nat_seqofs_lock);
|
||||
|
||||
pr_debug("nf_nat_resize_packet: Seq_offset after: ");
|
||||
pr_debug("adjust_tcp_sequence: Seq_offset after: ");
|
||||
DUMP_OFFSET(this_way);
|
||||
}
|
||||
|
||||
|
@@ -197,11 +197,11 @@ nf_nat_out(unsigned int hooknum,
|
||||
(ct = nf_ct_get(skb, &ctinfo)) != NULL) {
|
||||
enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
|
||||
|
||||
if (ct->tuplehash[dir].tuple.src.u3.ip !=
|
||||
ct->tuplehash[!dir].tuple.dst.u3.ip
|
||||
|| ct->tuplehash[dir].tuple.src.u.all !=
|
||||
ct->tuplehash[!dir].tuple.dst.u.all
|
||||
)
|
||||
if ((ct->tuplehash[dir].tuple.src.u3.ip !=
|
||||
ct->tuplehash[!dir].tuple.dst.u3.ip) ||
|
||||
(ct->tuplehash[dir].tuple.src.u.all !=
|
||||
ct->tuplehash[!dir].tuple.dst.u.all)
|
||||
)
|
||||
return ip_xfrm_me_harder(skb) == 0 ? ret : NF_DROP;
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user