* [PATCH] iptables: Fix warning in CONNMARK
@ 2004-10-24 13:57 Thomas Graf
2004-10-24 14:17 ` Patrick McHardy
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Graf @ 2004-10-24 13:57 UTC (permalink / raw)
To: David S. Miller; +Cc: laforge, hno, netdev
Signed-off-by: Thomas Graf <tgraf@suug.ch>
--- linux-2.6.10-rc1-bk1.orig/net/ipv4/netfilter/ipt_CONNMARK.c 2004-10-24 10:58:49.000000000 +0200
+++ linux-2.6.10-rc1-bk1/net/ipv4/netfilter/ipt_CONNMARK.c 2004-10-24 15:35:18.000000000 +0200
@@ -60,7 +60,7 @@
break;
case IPT_CONNMARK_RESTORE:
nfmark = (*pskb)->nfmark;
- diff = (ct->mark ^ nfmark & markinfo->mask);
+ diff = ((ct->mark ^ nfmark) & markinfo->mask);
if (diff != 0) {
(*pskb)->nfmark = nfmark ^ diff;
(*pskb)->nfcache |= NFC_ALTERED;
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] iptables: Fix warning in CONNMARK
2004-10-24 13:57 [PATCH] iptables: Fix warning in CONNMARK Thomas Graf
@ 2004-10-24 14:17 ` Patrick McHardy
0 siblings, 0 replies; 2+ messages in thread
From: Patrick McHardy @ 2004-10-24 14:17 UTC (permalink / raw)
To: Thomas Graf; +Cc: laforge, netdev, Netfilter Development Mailinglist, hno
Applied, thanks.
Thomas Graf wrote:
>Signed-off-by: Thomas Graf <tgraf@suug.ch>
>
>--- linux-2.6.10-rc1-bk1.orig/net/ipv4/netfilter/ipt_CONNMARK.c 2004-10-24 10:58:49.000000000 +0200
>+++ linux-2.6.10-rc1-bk1/net/ipv4/netfilter/ipt_CONNMARK.c 2004-10-24 15:35:18.000000000 +0200
>@@ -60,7 +60,7 @@
> break;
> case IPT_CONNMARK_RESTORE:
> nfmark = (*pskb)->nfmark;
>- diff = (ct->mark ^ nfmark & markinfo->mask);
>+ diff = ((ct->mark ^ nfmark) & markinfo->mask);
> if (diff != 0) {
> (*pskb)->nfmark = nfmark ^ diff;
> (*pskb)->nfcache |= NFC_ALTERED;
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-10-24 14:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-24 13:57 [PATCH] iptables: Fix warning in CONNMARK Thomas Graf
2004-10-24 14:17 ` Patrick McHardy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).