Skip to contentSkip to conversation

iptables: Fix warning in CONNMARK

PATCH Applied Thomas Graf 2 participants 2 messages Oct 24, 2004

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iptables: Fix warning in CONNMARK

net/ipv4/netfilter/ipt_CONNMARK.c +1 -1
@@ -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;
#1 lore raw

Applied, thanks.

Quoted 16 lines · Thomas Graf
net/ipv4/netfilter/ipt_CONNMARK.c +1 -1
@@ -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;