Skip to contentSkip to conversation

Trivial 2.6 tftp conntrack fix

PATCH Applied Rusty Russell 2 participants 2 messages Aug 20, 2003 – Aug 24, 2003

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Trivial 2.6 tftp conntrack fix

Name: TFTP Conntrack Helper Return Fix
Author: Rusty Russell
Status: Trivial

D: In 2.6, the TFTP conntrack helper returns -1 if the packet is too
D: short, but that is an invalid return code. Return NF_ACCEPT
D: instead.

net/ipv4/netfilter/ip_conntrack_tftp.c +1 -1
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .1520-linux-2.6.0-test3-bk6/net/ipv4/netfilter/ip_conntrack_tftp.c .1520-linux-2.6.0-test3-bk6.updated/net/ipv4/netfilter/ip_conntrack_tftp.c
@@ -44,7 +44,7 @@ static int tftp_help(struct sk_buff *skb
 
 	if (skb_copy_bits(skb, skb->nh.iph->ihl * 4 + sizeof(struct udphdr),
 			  &tftph, sizeof(tftph)) != 0)
-		return -1;
+		return NF_ACCEPT;
 
 	switch (ntohs(tftph.opcode)) {
 	/* RRQ and WRQ works the same way */

--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

#1 lore raw
Quoted 3 lines · On Thu, 21 Aug 2003 01:00:10 +1000 Rusty Russell <[email protected]> wrote:

D: In 2.6, the TFTP conntrack helper returns -1 if the packet is too
D: short, but that is an invalid return code. Return NF_ACCEPT
D: instead.

Applied, thanks Rusty.