linux-kernel - Re: linux-next: manual merge of the kspp tree with the net 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: <CAGXu5j+QLEXhEap=emvz7kB7Z4gqucy_yy2RVfu1xrKq_hxx4A@mail.gmail.com>
Date:   Thu, 11 Jan 2018 12:52:07 -0800
From:   Kees Cook <keescook@...gle.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        David Windsor <dave@...lcore.net>,
        Marcelo Ricardo Leitner <marcelo.leitner@...il.com>
Subject: Re: linux-next: manual merge of the kspp tree with the net tree

On Wed, Jan 10, 2018 at 8:40 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Kees,
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
>   net/sctp/socket.c
>
> between commit:
>
>   c76f97c99ae6 ("sctp: make use of pre-calculated len")
>
> from the net tree and commit:
>
>   3511d716f5a8 ("sctp: Copy struct sctp_sock.autoclose to userspace using put_user()")
>
> from the kspp tree.
>
> I fixed it up (I just used the latter version) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

Thanks! And yes, confirmed, the kspp tree version should be used to
resolve this conflict.

-Kees

-- 
Kees Cook
Pixel Security