All of lore.kernel.org
 help / color / mirror / Atom feed
* [1/1] OSF: fix 2.4 compilation.
@ 2005-11-26 12:33 Evgeniy Polyakov
  2005-11-26 23:42 ` Patrick McHardy
  0 siblings, 1 reply; 2+ messages in thread
From: Evgeniy Polyakov @ 2005-11-26 12:33 UTC (permalink / raw)
  To: netfilter-devel; +Cc: Harald Welte, PatriK McHardy

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

Signed-off-by: Evgeniy Polyakov <johnpol@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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [1/1] OSF: fix 2.4 compilation.
  2005-11-26 12:33 [1/1] OSF: fix 2.4 compilation Evgeniy Polyakov
@ 2005-11-26 23:42 ` Patrick McHardy
  0 siblings, 0 replies; 2+ messages in thread
From: Patrick McHardy @ 2005-11-26 23:42 UTC (permalink / raw)
  To: Evgeniy Polyakov; +Cc: Harald Welte, netfilter-devel

Evgeniy Polyakov wrote:
> Bug found by Aleksey Barabanov <alekseybb mail.ru>.
> Thank you.
> 
> Signed-off-by: Evgeniy Polyakov <johnpol@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

This doesn't apply, I had to fix it up by hand. Please
make sure future patches are based in the patch-o-matic
root and patch the right file.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2005-11-26 23:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-26 12:33 [1/1] OSF: fix 2.4 compilation Evgeniy Polyakov
2005-11-26 23:42 ` Patrick McHardy

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.