[PATCH] ip_conntrack_irc, allowance for quoted filenames

[Rene Herman <rene.herman@keyaccess.nl>]

[-- Attachment #1: Type: text/plain, Size: 507 bytes --]

Resend, this time _with_ patch ...

[ please keep me in CC, not subscribed ]

When the irssi (www.irssi.org) IRC client is asked to DCC SEND a file
with a filename containing spaces, it does so by leaving the spaces
intact and quoting the filename (""). ip_conntrack_irc.c:parse_dcc()
however can't handle the embedded spaces.

I haven't checked other clients but I assume they might do the same. Is
the attached hack (against 2.4.20) acceptable? Should this be solved
differently and/or elsewhere?

Rene.


[-- Attachment #2: linux-2.4.20-ip_conntrack_irc.diff --]
[-- Type: text/plain, Size: 568 bytes --]

--- linux-2.4.20/net/ipv4/netfilter/ip_conntrack_irc.c.orig	2002-12-01 02:32:52.000000000 +0100
+++ linux-2.4.20/net/ipv4/netfilter/ip_conntrack_irc.c	2003-05-12 02:10:01.000000000 +0200
@@ -82,6 +82,12 @@
 	ad_beg_p	returns pointer to first byte of addr data
 	ad_end_p	returns pointer to last byte of addr data */
 {
+	/* handle quoted arguments containing spaces */
+	if (*data == '"')
+		/* at least 14: "\" AAAAAAAA P\1\n" */
+		while (*++data != '"')
+			if (data > data_end - 14)
+				return -1;
 
 	/* at least 12: "AAAAAAAA P\1\n" */
 	while (*data++ != ' ')