[netfilter-cvslog] r6282 - trunk/patch-o-matic-ng/patchlets/osf/linux/net/ipv4/netfilter

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2005-11-27 00:42:38 +0100 (Sun, 27 Nov 2005)
New Revision: 6282

Modified:
   trunk/patch-o-matic-ng/patchlets/osf/linux/net/ipv4/netfilter/ipt_osf.c
Log:
OSF: fix 2.4 compilation.

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

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


Modified: trunk/patch-o-matic-ng/patchlets/osf/linux/net/ipv4/netfilter/ipt_osf.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/osf/linux/net/ipv4/netfilter/ipt_osf.c	2005-11-24 21:44:30 UTC (rev 6281)
+++ trunk/patch-o-matic-ng/patchlets/osf/linux/net/ipv4/netfilter/ipt_osf.c	2005-11-26 23:42:38 UTC (rev 6282)
@@ -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;
 		}
 	}