netdev - netfilter merge conflict...

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20080714.203107.107924149.davem@davemloft.net>
Date:	Mon, 14 Jul 2008 20:31:07 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	kaber@...sh.net
CC:	netdev@...r.kernel.org, sfr@...b.auug.org.au
Subject: netfilter merge conflict...

Patrick, I had to resolve a conflict in nf_conntrack_proto_tcp.c when
I merged net-2.6 into net-next-2.6 in preparation for merging with
Linus.  This is the same one Stephen started hitting when building the
linux-next tree last week.

The problem is the looping fix.

What I did was first add a changeset that modifies __nf_ct_kill*() to
return a boolean that indicates if the del_timer() returned true.
This return value propagates through nf_ct_kill() as well.

Then I did the merge and resolved it by making the loop prevention code
look like:

			if (nf_ct_kill(ct))
				return -NF_REPEAT;
			return -NF_DROP;

Just FYI...  this is pushed out to net-next-2.6 if you want to have a
closer look.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html