netdev - Re: netfilter 00/31: netfilter update

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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4A311AB9.3060205@trash.net>
Date:	Thu, 11 Jun 2009 16:54:49 +0200
From:	Patrick McHardy <kaber@...sh.net>
To:	David Miller <davem@...emloft.net>
CC:	netdev@...r.kernel.org, netfilter-devel@...r.kernel.org
Subject: Re: netfilter 00/31: netfilter update

Patrick McHardy wrote:
> David Miller wrote:
>> This stuff isn't ready, sorry I had to undo my pull:
>>
>> net/netfilter/nf_conntrack_proto_tcp.c: In function 'tcp_packet':
>> net/netfilter/nf_conntrack_proto_tcp.c:947: error: 'tcp_lock' 
>> undeclared (first use in this function)
>> net/netfilter/nf_conntrack_proto_tcp.c:947: error: (Each undeclared 
>> identifier is reported only once
>> net/netfilter/nf_conntrack_proto_tcp.c:947: error: for each function 
>> it appears in.)
>> make[2]: *** [net/netfilter/nf_conntrack_proto_tcp.o] Error 1
>> make[2]: *** Waiting for unfinished jobs....
> 
> That odd, my tree doesn't have a single reference to tcp_lock left.
> I'll check what went wrong, sorry.

This came in through a net-2.6.git merge after I cloned my tree. I
usually do a test merge of a fresh clone of your tree with mine before
sending the pull request, but forgot this time. I guess I'll add this
step to my pull-request-script to make sure it doesn't happen again.

I've now merged your latest tree and added the attached patch on top
to fix the compile error. This will unfortunately leave a small window
of commits that don't compile cleanly. If you prefer to have this fixed
differently, please let me know, otherwise

Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git master

Thanks!

View attachment "01.diff" of type "text/x-patch" (944 bytes)