[RESEND 2] [1/2] OSF: fix 2.4 compilation.

Evgeniy Polyakov johnpol at 2ka.mipt.ru
Tue Dec 6 14:51:58 CET 2005


Bug found by Aleksey Barabanov <alekseybb mail.ru>.
Thank you.

Signed-off-by: Evgeniy Polyakov <johnpol at 2ka.mipt.ru>

--- net/ipv4/netfilter/ipt_osf.c.orig	2005-11-26 15:29:33.000000000 +0300
+++ net/ipv4/netfilter/tmp/ipt_osf.c	2005-11-26 15:29:05.000000000 +0300
@@ -183,11 +183,11 @@
 		_optp = optp = (char *)(tcp+1);
 		optsize = tcp->doff*4 - sizeof(struct tcphdr);
 
-		if (optsize > sizeof(opts))
+		if (optsize > MAX_IPOPTLEN)
 		{
-			log("%s: BUG: too big options size: optsize=%lu, max=%zu.\n",
-					__func__, optsize, sizeof(opts));
-			optsize = sizeof(opts);
+			log("%s: BUG: too big options size: optsize=%lu, max=%u.\n",
+					__func__, optsize, MAX_IPOPTLEN);
+			optsize = MAX_IPOPTLEN;
 		}
 	}
 

-- 
	Evgeniy Polyakov



More information about the netfilter-devel mailing list