Re: [PATCH] netfilter: ipset: hash:net,iface: fix interface comparision

[Pablo Neira Ayuso <pablo@netfilter.org>]

On Tue, Jun 26, 2012 at 09:08:31AM +0200, Jozsef Kadlecsik wrote:
> On Mon, 25 Jun 2012, Pablo Neira Ayuso wrote:
> 
> > On Sun, Jun 17, 2012 at 09:56:46PM +0200, Florian Westphal wrote:
> > > ifname_compare() assumes that skb->dev is zero-padded,
> > > e.g 'eth1\0\0\0\0\0...'. This isn't always the case. e1000 driver does
> > > 
> > > strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
> > > 
> > > in e1000_probe(), so once device is registered dev->name memory contains
> > > 'eth1\0:0:3\0\0\0' (or something like that), which makes eth1 compare
> > > fail.
> > > 
> > > Use plain strcmp() instead.
> > 
> > Applied, thanks Florian.
> 
> Thanks, Pablo! I had commited the patch in my ipset git tree, just haven't 
> time yet to send/ack to you.

No problem. Please, rebase your tree to remove it:

git rebase -i COMMIT_YOU_WANT_TO_REMOVE^
# then, write "e" in the patch you want to remove on the list that it shows
git reset HEAD^
git reset --hard
git rebase --continue

Not sure if there's a smarter way to do it. This is how I make it
though.

Note that we're on -rc4, so please send me important fixes that you
want me to pass to David first, after that those to net-next.

Thanks Jozsef.