linux-kernel - Re: linux-next: manual merge of the ipsec-next tree with Linus' tree

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

Message-ID: <20200616162350.GK13121@gauss3.secunet.de>
Date:   Tue, 16 Jun 2020 18:23:50 +0200
From:   Steffen Klassert <steffen.klassert@...unet.com>
To:     David Ahern <dsahern@...il.com>
CC:     Stephen Rothwell <sfr@...b.auug.org.au>,
        "David S. Miller" <davem@...emloft.net>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Florian Westphal <fw@...len.de>
Subject: Re: linux-next: manual merge of the ipsec-next tree with Linus' tree

On Tue, Jun 16, 2020 at 07:39:30AM -0600, David Ahern wrote:
> > 
> > Indeed. I must have been looking at -net. Both -net and -net-next have
> > it conditional, so yes a fixup patch is needed.
> > 
> 
> I see that both net and net-next still have the conditional in xfrm_output:
> 
> #ifdef CONFIG_NETFILTER
>                 IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;
> #endif
>                 break;
>         case AF_INET6:
>                 memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
> 
> #ifdef CONFIG_NETFILTER
>                 IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
> #endif
> 
> Did you submit the merge fix? If not, I can do it today.

I still have it in the ipsec tree, I'll do a pull request
this week. The fixup will go to the net tree then. It should
be already in linux-next.