linux-kernel - Re: [GIT PULL] locking changes for v5.5

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: <20191126083801.GB98591@gmail.com>
Date:   Tue, 26 Nov 2019 09:38:01 +0100
From:   Ingo Molnar <mingo@...nel.org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     linux-kernel@...r.kernel.org,
        Peter Zijlstra <a.p.zijlstra@...llo.nl>,
        Thomas Gleixner <tglx@...utronix.de>,
        Will Deacon <will@...nel.org>,
        "Paul E. McKenney" <paulmck@...nel.org>,
        Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: [GIT PULL] locking changes for v5.5


* Ingo Molnar <mingo@...nel.org> wrote:

> Linus,
> 
> Please pull the latest locking-core-for-linus git tree from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-core-for-linus
> 
>    # HEAD: 500543c53a54134ced386aed85cd93cf1363f981 lkdtm: Remove references to CONFIG_REFCOUNT_FULL

>  net/core/sock.c                               |   2 +-

Merge conflict note, the following commit from the locking tree:

   5facae4f3549: ("locking/lockdep: Remove unused @nested argument from lock_release()")

Conflicts with the following new commit in the networking tree, also 
upstream now:

  8265792bf887: ("net: silence KCSAN warnings around sk_add_backlog() calls")

This is just a context conflict, the two one-liner changes can be applied 
independently, resulting in:

  5facae4f3549:                 mutex_release(&sk->sk_lock.dep_map, _RET_IP_);
  8265792bf887:        } else if (sk_add_backlog(sk, skb, READ_ONCE(sk->sk_rcvbuf))) {

This resolution is in tip:master as well.

Thanks,

	Ingo